X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/10ebd5818bc1f7afae394a7d3adc8792c257f41d..ec00f379dc42b00a64ab1af25bb4bb1a06bd7449:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 9e5f14aa3..37f0bf172 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -25,21 +25,24 @@ #include "dolphin_iconsmodesettings.h" -#include -#include -#include +#include -#include -#include +#include +#include +#include +#include DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) : - KListView(parent), - m_controller(controller) + KCategorizedView(parent), + m_controller(controller), + m_itemSize(), + m_dragging(false), + m_dropRect() { Q_ASSERT(controller != 0); setViewMode(QListView::IconMode); setResizeMode(QListView::Adjust); - + setSpacing(KDialog::spacingHint()); setMouseTracking(true); viewport()->setAttribute(Qt::WA_Hover); @@ -50,8 +53,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle 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&)), controller, SLOT(emitItemEntered(const QModelIndex&))); connect(this, SIGNAL(viewportEntered()), @@ -69,17 +70,15 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); Q_ASSERT(settings != 0); - m_viewOptions = KListView::viewOptions(); + m_viewOptions = KCategorizedView::viewOptions(); m_viewOptions.showDecorationSelected = true; QFont font(settings->fontFamily(), settings->fontSize()); font.setItalic(settings->italicFont()); font.setBold(settings->boldFont()); m_viewOptions.font = font; - if (settings->numberOfTextlines() > 1) { - m_viewOptions.features = QStyleOptionViewItemV2::WrapText; - } + setWordWrap(settings->numberOfTextlines() > 1); updateGridSize(controller->showPreview(), controller->showAdditionalInfo()); if (settings->arrangement() == QListView::TopToBottom) { @@ -88,6 +87,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle } else { setFlow(QListView::TopToBottom); m_viewOptions.decorationPosition = QStyleOptionViewItem::Left; + m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter; } } @@ -95,6 +95,35 @@ DolphinIconsView::~DolphinIconsView() { } +QRect DolphinIconsView::visualRect(const QModelIndex& index) const +{ + 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); + } + + 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); + } + + return itemRect; +} + QStyleOptionViewItem DolphinIconsView::viewOptions() const { return m_viewOptions; @@ -102,14 +131,21 @@ QStyleOptionViewItem DolphinIconsView::viewOptions() const void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event) { - KListView::contextMenuEvent(event); + KCategorizedView::contextMenuEvent(event); m_controller->triggerContextMenuRequest(event->pos()); } -void DolphinIconsView::mouseReleaseEvent(QMouseEvent* event) +void DolphinIconsView::mousePressEvent(QMouseEvent* event) { - KListView::mouseReleaseEvent(event); m_controller->triggerActivation(); + if (!indexAt(event->pos()).isValid()) { + const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); + if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) { + clearSelection(); + } + } + + KCategorizedView::mousePressEvent(event); } void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event) @@ -117,18 +153,53 @@ void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event) if (event->mimeData()->hasUrls()) { event->acceptProposedAction(); } + m_dragging = true; +} + +void DolphinIconsView::dragLeaveEvent(QDragLeaveEvent* event) +{ + KCategorizedView::dragLeaveEvent(event); + + // TODO: remove this code when the issue #160611 is solved in Qt 4.4 + m_dragging = false; + setDirtyRegion(m_dropRect); +} + +void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event) +{ + KCategorizedView::dragMoveEvent(event); + + // TODO: remove this code when the issue #160611 is solved in Qt 4.4 + const QModelIndex index = indexAt(event->pos()); + setDirtyRegion(m_dropRect); + m_dropRect = visualRect(index); + setDirtyRegion(m_dropRect); } void DolphinIconsView::dropEvent(QDropEvent* event) { - const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); - if (!urls.isEmpty()) { - m_controller->indicateDroppedUrls(urls, - indexAt(event->pos()), - event->source()); - event->acceptProposedAction(); + if (!selectionModel()->isSelected(indexAt(event->pos()))) { + const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); + if (!urls.isEmpty()) { + m_controller->indicateDroppedUrls(urls, + indexAt(event->pos()), + event->source()); + event->acceptProposedAction(); + } + } + KCategorizedView::dropEvent(event); + m_dragging = false; +} + +void DolphinIconsView::paintEvent(QPaintEvent* event) +{ + KCategorizedView::paintEvent(event); + + // TODO: remove this code when the issue #160611 is solved in Qt 4.4 + if (m_dragging) { + const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight); + DolphinController::drawHoverIndication(viewport(), m_dropRect, brush); } - KListView::dropEvent(event); } void DolphinIconsView::slotShowPreviewChanged(bool showPreview) @@ -164,8 +235,8 @@ void DolphinIconsView::zoomIn() // increase also the grid size const int diff = newIconSize - oldIconSize; - settings->setGridWidth(settings->gridWidth() + diff); - settings->setGridHeight(settings->gridHeight() + diff); + settings->setItemWidth(settings->itemWidth() + diff); + settings->setItemHeight(settings->itemHeight() + diff); updateGridSize(showPreview, m_controller->showAdditionalInfo()); } @@ -195,8 +266,8 @@ void DolphinIconsView::zoomOut() // decrease also the grid size const int diff = oldIconSize - newIconSize; - settings->setGridWidth(settings->gridWidth() - diff); - settings->setGridHeight(settings->gridHeight() - diff); + settings->setItemWidth(settings->itemWidth() - diff); + settings->setItemHeight(settings->itemHeight() - diff); updateGridSize(showPreview, m_controller->showAdditionalInfo()); } @@ -251,26 +322,37 @@ void DolphinIconsView::updateGridSize(bool showPreview, bool showAdditionalInfo) const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); Q_ASSERT(settings != 0); - int gridWidth = settings->gridWidth(); - int gridHeight = settings->gridHeight(); + int itemWidth = settings->itemWidth(); + int itemHeight = settings->itemHeight(); int size = settings->iconSize(); if (showPreview) { const int previewSize = settings->previewSize(); const int diff = previewSize - size; Q_ASSERT(diff >= 0); - gridWidth += diff; - gridHeight += diff; + itemWidth += diff; + itemHeight += diff; size = previewSize; } if (showAdditionalInfo) { - gridHeight += m_viewOptions.font.pointSize() * 2; + itemHeight += m_viewOptions.font.pointSize() * 2; } - m_viewOptions.decorationSize = QSize(size, size); - setGridSize(QSize(gridWidth, gridHeight)); + if (settings->arrangement() == QListView::TopToBottom) { + // The decoration width indirectly defines the maximum + // width for the text wrapping. To use the maximum item width + // for text wrapping, it is used as decoration width. + m_viewOptions.decorationSize = QSize(itemWidth, size); + } else { + m_viewOptions.decorationSize = QSize(size, size); + } + + const int spacing = settings->gridSpacing(); + setGridSize(QSize(itemWidth + spacing, itemHeight + spacing)); + + m_itemSize = QSize(itemWidth, itemHeight); m_controller->setZoomInPossible(isZoomInPossible()); m_controller->setZoomOutPossible(isZoomOutPossible());