X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/51cbeaf512da9ebaefb0bfcaa21cca0f47d1b79d..13b2fc55704fbc734cd4f9cbae56cfc2ef3ec0ce:/src/dolphindetailsview.cpp diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 75481fb36..932efcb1e 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -46,10 +46,12 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) : QTreeView(parent), m_autoResize(true), + m_expandingTogglePressed(false), + m_keyPressed(false), m_controller(controller), + m_selectionManager(0), m_font(), m_decorationSize(), - m_dragging(false), m_showElasticBand(false), m_elasticBandOrigin(), m_elasticBandDestination() @@ -67,9 +69,9 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr setAlternatingRowColors(true); setRootIsDecorated(settings->expandableFolders()); setItemsExpandable(settings->expandableFolders()); + setEditTriggers(QAbstractItemView::NoEditTriggers); setMouseTracking(true); - viewport()->setAttribute(Qt::WA_Hover); const ViewProperties props(controller->url()); setSortIndicatorSection(props.sorting()); @@ -97,17 +99,17 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr // RETURN-key in keyPressEvent(). if (KGlobalSettings::singleClick()) { connect(this, SIGNAL(clicked(const QModelIndex&)), - this, SLOT(triggerItem(const QModelIndex&))); + controller, SLOT(triggerItem(const QModelIndex&))); if (DolphinSettings::instance().generalSettings()->showSelectionToggle()) { - SelectionManager* selManager = new SelectionManager(this); - connect(selManager, SIGNAL(selectionChanged()), + m_selectionManager = new SelectionManager(this); + connect(m_selectionManager, SIGNAL(selectionChanged()), this, SLOT(requestActivation())); connect(m_controller, SIGNAL(urlChanged(const KUrl&)), - selManager, SLOT(reset())); - } + m_selectionManager, SLOT(reset())); + } } else { connect(this, SIGNAL(doubleClicked(const QModelIndex&)), - this, SLOT(triggerItem(const QModelIndex&))); + controller, SLOT(triggerItem(const QModelIndex&))); } connect(this, SIGNAL(entered(const QModelIndex&)), this, SLOT(slotEntered(const QModelIndex&))); @@ -129,18 +131,13 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr settings->italicFont()); } -// TODO: Remove this check when 4.3.2 is released and KDE requires it... this -// check avoids a division by zero happening on versions before 4.3.1. -// Right now KDE in theory can be shipped with Qt 4.3.0 and above. -// ereslibre -#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY)) setVerticalScrollMode(QTreeView::ScrollPerPixel); setHorizontalScrollMode(QTreeView::ScrollPerPixel); -#endif updateDecorationSize(); setFocus(); + viewport()->installEventFilter(this); connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()), this, SLOT(updateFont())); @@ -161,19 +158,12 @@ bool DolphinDetailsView::event(QEvent* event) hideColumn(DolphinModel::Rating); hideColumn(DolphinModel::Tags); - } -// TODO: Remove this check when 4.3.2 is released and KDE requires it... this -// check avoids a division by zero happening on versions before 4.3.1. -// Right now KDE in theory can be shipped with Qt 4.3.0 and above. -// ereslibre -#if (QT_VERSION >= QT_VERSION_CHECK(4, 3, 2) || defined(QT_KDE_QT_COPY)) - else if (event->type() == QEvent::UpdateRequest) { + } else if (event->type() == QEvent::UpdateRequest) { // a wheel movement will scroll 4 items if (model()->rowCount() > 0) { verticalScrollBar()->setSingleStep((sizeHintForRow(0) / 3) * 4); } } -#endif return QTreeView::event(event); } @@ -199,15 +189,34 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event) QTreeView::mousePressEvent(event); + m_expandingTogglePressed = false; const QModelIndex index = indexAt(event->pos()); + const bool updateState = index.isValid() && + (index.column() == DolphinModel::Name) && + (event->button() == Qt::LeftButton); + if (updateState) { + // TODO: See comment in DolphinIconsView::mousePressEvent(). Only update + // the state if no expanding/collapsing area has been hit: + const QRect rect = visualRect(index); + if (event->pos().x() >= rect.x() + indentation()) { + setState(QAbstractItemView::DraggingState); + } else { + m_expandingTogglePressed = true; + } + } + if (!index.isValid() || (index.column() != DolphinModel::Name)) { + if (QApplication::mouseButtons() & Qt::MidButton) { + m_controller->replaceUrlByClipboard(); + } + const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) { clearSelection(); } } - if (event->button() == Qt::LeftButton) { + if ((event->button() == Qt::LeftButton) && !m_expandingTogglePressed) { m_showElasticBand = true; const QPoint pos(contentsPos()); @@ -237,35 +246,31 @@ void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event) setSelection(selRect, QItemSelectionModel::Select); } - // TODO: see comment at end of method + // TODO: enable QTreeView::mouseMoveEvent(event) again, as soon + // as the Qt-issue #199631 has been fixed. // QTreeView::mouseMoveEvent(event); QAbstractItemView::mouseMoveEvent(event); updateElasticBand(); } else { - // TODO: see comment at end of method - //QTreeView::mouseMoveEvent(event); + // TODO: enable QTreeView::mouseMoveEvent(event) again, as soon + // as the Qt-issue #199631 has been fixed. + // QTreeView::mouseMoveEvent(event); QAbstractItemView::mouseMoveEvent(event); } - // The original implementation of QTreeView::mouseMoveEvent() looks like this (Qt4.4): - // - // void QTreeView::mouseMoveEvent(QMouseEvent *event) - // { - // Q_D(QTreeView); - // if (d->itemDecorationAt(event->pos()) == -1) // ### what about expanding/collapsing state ? - // QAbstractItemView::mouseMoveEvent(event); - // } - // - // This prevents that the signal 'entered()' is emitted when the mouse is above a decoration, - // although the hovered item has changed. The SelectionManager is connected to 'entered()' - // and assumes that the old item is selected. This is currently bypassed by skipping - // the base implementation and invoking QAbstractItemView::mouseMoveEvent() directly. - // Submitted a bug report to Trolltech, bug ID is still pending. + if (m_expandingTogglePressed) { + // Per default QTreeView starts either a selection or a drag operation when dragging + // the expanding toggle button (Qt-issue - see TODO comment in DolphinIconsView::mousePressEvent()). + // Turn off this behavior in Dolphin to stay predictable: + clearSelection(); + setState(QAbstractItemView::NoState); + } } void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event) { QTreeView::mouseReleaseEvent(event); + m_expandingTogglePressed = false; if (m_showElasticBand) { updateElasticBand(); m_showElasticBand = false; @@ -275,6 +280,7 @@ void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event) void DolphinDetailsView::startDrag(Qt::DropActions supportedActions) { DragAndDropHelper::startDrag(this, supportedActions); + m_showElasticBand = false; } void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event) @@ -287,15 +293,11 @@ void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event) 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); } @@ -306,11 +308,8 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* 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() != DolphinModel::Name)) { - m_dragging = false; - } else { - m_dragging = true; - const KFileItem item = itemForIndex(index); + if (index.isValid() && (index.column() == DolphinModel::Name)) { + const KFileItem item = m_controller->itemForIndex(index); if (!item.isNull() && item.isDir()) { m_dropRect = visualRect(index); } else { @@ -333,14 +332,13 @@ void DolphinDetailsView::dropEvent(QDropEvent* event) const QModelIndex index = indexAt(event->pos()); KFileItem item; if (index.isValid() && (index.column() == DolphinModel::Name)) { - item = itemForIndex(index); + item = m_controller->itemForIndex(index); } m_controller->indicateDroppedUrls(urls, m_controller->url(), item); } QTreeView::dropEvent(event); - m_dragging = false; } void DolphinDetailsView::paintEvent(QPaintEvent* event) @@ -361,26 +359,19 @@ void DolphinDetailsView::paintEvent(QPaintEvent* event) style()->drawControl(QStyle::CE_RubberBand, &opt, &painter); painter.restore(); } - - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - if (m_dragging) { - const QBrush& brush = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight); - DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush); - } } void DolphinDetailsView::keyPressEvent(QKeyEvent* event) { QTreeView::keyPressEvent(event); + m_controller->handleKeyPressEvent(event); + m_keyPressed = true; +} - const QItemSelectionModel* selModel = selectionModel(); - const QModelIndex currentIndex = selModel->currentIndex(); - const bool trigger = currentIndex.isValid() - && (event->key() == Qt::Key_Return) - && (selModel->selectedIndexes().count() <= 1); - if (trigger) { - triggerItem(currentIndex); - } +void DolphinDetailsView::keyReleaseEvent(QKeyEvent* event) +{ + QTreeView::keyReleaseEvent(event); + m_keyPressed = false; } void DolphinDetailsView::resizeEvent(QResizeEvent* event) @@ -393,14 +384,42 @@ void DolphinDetailsView::resizeEvent(QResizeEvent* event) void DolphinDetailsView::wheelEvent(QWheelEvent* event) { + if (m_selectionManager != 0) { + m_selectionManager->reset(); + } + // let Ctrl+wheel events propagate to the DolphinView for icon zooming - if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier) { + if (event->modifiers() & Qt::ControlModifier) { event->ignore(); - return; + return; } + QTreeView::wheelEvent(event); } +void DolphinDetailsView::currentChanged(const QModelIndex& current, const QModelIndex& previous) +{ + QTreeView::currentChanged(current, previous); + + // Stay consistent with QListView: When changing the current index by key presses, + // also change the selection. + if (m_keyPressed) { + selectionModel()->select(current, QItemSelectionModel::ClearAndSelect); + } +} + +bool DolphinDetailsView::eventFilter(QObject* watched, QEvent* event) +{ + if ((watched == viewport()) && (event->type() == QEvent::Leave)) { + // if the mouse is above an item and moved very fast outside the widget, + // no viewportEntered() signal might be emitted although the mouse has been moved + // above the viewport + m_controller->emitViewportEntered(); + } + + return QTreeView::eventFilter(watched, event); +} + void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting) { QHeaderView* headerView = header(); @@ -428,7 +447,7 @@ void DolphinDetailsView::slotEntered(const QModelIndex& index) const QPoint pos = viewport()->mapFromGlobal(QCursor::pos()); const int nameColumnWidth = header()->sectionSize(DolphinModel::Name); if (pos.x() < nameColumnWidth) { - m_controller->emitItemEntered(itemForIndex(index)); + m_controller->emitItemEntered(index); } else { m_controller->emitViewportEntered(); @@ -478,17 +497,6 @@ void DolphinDetailsView::zoomOut() } } -void DolphinDetailsView::triggerItem(const QModelIndex& index) -{ - const KFileItem item = itemForIndex(index); - if (index.isValid() && (index.column() == KDirModel::Name)) { - m_controller->triggerItem(item); - } else { - clearSelection(); - m_controller->emitItemEntered(item); - } -} - void DolphinDetailsView::configureColumns(const QPoint& pos) { KMenu popup(this); @@ -591,6 +599,10 @@ void DolphinDetailsView::updateDecorationSize() m_controller->setZoomInPossible(isZoomInPossible()); m_controller->setZoomOutPossible(isZoomOutPossible()); + if (m_selectionManager != 0) { + m_selectionManager->reset(); + } + doItemsLayout(); } @@ -612,14 +624,6 @@ QPoint DolphinDetailsView::contentsPos() const return QPoint(0, y); } -KFileItem DolphinDetailsView::itemForIndex(const QModelIndex& index) const -{ - QAbstractProxyModel* proxyModel = static_cast(model()); - KDirModel* dirModel = static_cast(proxyModel->sourceModel()); - const QModelIndex dirIndex = proxyModel->mapToSource(index); - return dirModel->itemForIndex(dirIndex); -} - KFileItemDelegate::Information DolphinDetailsView::infoForColumn(int columnIndex) const { KFileItemDelegate::Information info = KFileItemDelegate::NoInformation;