X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/38fa728aa607af2fb890f4d602d68ed1ae9d2278..629ec98952bcf38bc99f2b11bc37bdc2ec7aabcc:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index dda538e16..3cb9b929d 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -30,16 +30,17 @@ #include #include #include +#include #include #include -#include -#include #include DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) : KCategorizedView(parent), + m_enableScrollTo(false), m_controller(controller), + m_selectionManager(0), m_categoryDrawer(0), m_font(), m_decorationSize(), @@ -54,8 +55,11 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle setSpacing(KDialog::spacingHint()); setMovement(QListView::Static); setDragEnabled(true); + setEditTriggers(QAbstractItemView::NoEditTriggers); viewport()->setAcceptDrops(true); + setMouseTracking(true); + // TODO: Connecting to the signal 'activated()' is not possible, as kstyle // does not forward the single vs. doubleclick to it yet (KDE 4.1?). Hence it is // necessary connecting the signal 'singleClick()' or 'doubleClick' and to handle the @@ -64,11 +68,11 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle connect(this, SIGNAL(clicked(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&)), @@ -130,48 +134,29 @@ DolphinIconsView::~DolphinIconsView() m_categoryDrawer = 0; } -QRect DolphinIconsView::visualRect(const QModelIndex& index) const +void DolphinIconsView::scrollTo(const QModelIndex& index, ScrollHint hint) { - const bool leftToRightFlow = (flow() == QListView::LeftToRight); - - QRect itemRect = KCategorizedView::visualRect(index); - - const int maxWidth = m_itemSize.width(); - const int maxHeight = m_itemSize.height(); - - if (itemRect.width() > maxWidth) { - // assure that the maximum item width is not exceeded - if (leftToRightFlow) { - const int left = itemRect.left() + (itemRect.width() - maxWidth) / 2; - itemRect.setLeft(left); - } - itemRect.setWidth(maxWidth); + // Enable the QListView implementation of scrollTo() only if it has been + // triggered by a key press. Otherwise QAbstractItemView wants to scroll to the current + // index each time the layout has been changed. This becomes an issue when + // previews are loaded and the scrollbar is used: the scrollbar will always + // be reset to 0 on each new preview. + if (m_enableScrollTo || (state() != QAbstractItemView::NoState)) { + KCategorizedView::scrollTo(index, hint); + m_enableScrollTo = false; } +} - if (itemRect.height() > maxHeight) { - // assure that the maximum item height is not exceeded - if (!leftToRightFlow) { - const int top = itemRect.top() + (itemRect.height() - maxHeight) / 2; - itemRect.setTop(top); - } - itemRect.setHeight(maxHeight); - } +void DolphinIconsView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) +{ + KCategorizedView::dataChanged(topLeft, bottomRight); KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast(model()); - if (leftToRightFlow && !proxyModel->isCategorizedModel()) { - // TODO: QListView::visualRect() calculates a wrong position of the items under - // certain circumstances (e. g. if the text is too long). This issue is bypassed - // by the following code (I'll try create a patch for Qt but as Dolphin must also work with - // Qt 4.3.0 this workaround must get applied at least for KDE 4.0). - const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); - const int margin = settings->gridSpacing(); - const int gridWidth = gridSize().width(); - const int gridIndex = (itemRect.left() - margin + 1) / gridWidth; - const int centerInc = (maxWidth - itemRect.width()) / 2; - itemRect.moveLeft((gridIndex * gridWidth) + margin + centerInc); + if ((flow() == QListView::LeftToRight) && !proxyModel->isCategorizedModel()) { + // bypass a QListView issue that items are not layout correctly if the decoration size of + // an index changes + scheduleDelayedItemsLayout(); } - - return itemRect; } QStyleOptionViewItem DolphinIconsView::viewOptions() const @@ -194,7 +179,20 @@ void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event) void DolphinIconsView::mousePressEvent(QMouseEvent* event) { m_controller->requestActivation(); - if (!indexAt(event->pos()).isValid()) { + const QModelIndex index = indexAt(event->pos()); + if (index.isValid() && (event->button() == Qt::LeftButton)) { + // TODO: It should not be necessary to manually set the dragging state, but I could + // not reproduce this issue with a Qt-only example yet to find the root cause. + // Issue description: start Dolphin, split the view and drag an item from the + // inactive view to the active view by a very fast mouse movement. Result: + // the item gets selected instead of being dragged... + setState(QAbstractItemView::DraggingState); + } + + if (!index.isValid()) { + if (QApplication::mouseButtons() & Qt::MidButton) { + m_controller->replaceUrlByClipboard(); + } const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) { clearSelection(); @@ -271,10 +269,15 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event) { KCategorizedView::keyPressEvent(event); m_controller->handleKeyPressEvent(event); + m_enableScrollTo = true; // see DolphinIconsView::scrollTo() } void DolphinIconsView::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) { event->ignore(); @@ -296,6 +299,23 @@ void DolphinIconsView::wheelEvent(QWheelEvent* event) } } +void DolphinIconsView::showEvent(QShowEvent* event) +{ + KFileItemDelegate* delegate = dynamic_cast(itemDelegate()); + delegate->setMaximumSize(m_itemSize); + + KCategorizedView::showEvent(event); +} + +void DolphinIconsView::leaveEvent(QEvent* event) +{ + KCategorizedView::leaveEvent(event); + // 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(); +} + void DolphinIconsView::slotShowPreviewChanged() { const DolphinView* view = m_controller->dolphinView(); @@ -324,10 +344,6 @@ void DolphinIconsView::zoomIn() } else { newIconSize = increasedIconSize(oldIconSize); settings->setIconSize(newIconSize); - if (settings->previewSize() < newIconSize) { - // assure that the preview size is always >= the icon size - settings->setPreviewSize(newIconSize); - } } // increase also the grid size @@ -351,11 +367,6 @@ void DolphinIconsView::zoomOut() if (showPreview) { const int previewSize = decreasedIconSize(settings->previewSize()); settings->setPreviewSize(previewSize); - if (settings->iconSize() > previewSize) { - // assure that the icon size is always <= the preview size - newIconSize = previewSize; - settings->setIconSize(newIconSize); - } } else { newIconSize = decreasedIconSize(settings->iconSize()); settings->setIconSize(newIconSize); @@ -441,7 +452,6 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) if (showPreview) { const int previewSize = settings->previewSize(); const int diff = previewSize - size; - Q_ASSERT(diff >= 0); itemWidth += diff; itemHeight += diff; @@ -469,6 +479,15 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) m_controller->setZoomInPossible(isZoomInPossible()); m_controller->setZoomOutPossible(isZoomOutPossible()); + + KFileItemDelegate* delegate = dynamic_cast(itemDelegate()); + if (delegate != 0) { + delegate->setMaximumSize(m_itemSize); + } + + if (m_selectionManager != 0) { + m_selectionManager->reset(); + } } int DolphinIconsView::additionalInfoCount() const