X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/29402a79bc09945ccd96201cbb42027b4c581a00..d6488887ecf69d7f192b94de8dce34fae0b7eb76:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 042c9a76c..61179a3ac 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -22,9 +22,10 @@ #include "dolphincategorydrawer.h" #include "dolphincontroller.h" #include "dolphinsettings.h" - #include "dolphin_iconsmodesettings.h" +#include "draganddrophelper.h" +#include #include #include @@ -45,6 +46,10 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle setViewMode(QListView::IconMode); setResizeMode(QListView::Adjust); setSpacing(KDialog::spacingHint()); + setMovement(QListView::Static); + setDragEnabled(true); + viewport()->setAcceptDrops(true); + setMouseTracking(true); viewport()->setAttribute(Qt::WA_Hover); @@ -54,22 +59,24 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle // RETURN-key in keyPressEvent(). if (KGlobalSettings::singleClick()) { connect(this, SIGNAL(clicked(const QModelIndex&)), - controller, SLOT(triggerItem(const QModelIndex&))); + this, SLOT(triggerItem(const QModelIndex&))); } else { connect(this, SIGNAL(doubleClicked(const QModelIndex&)), - controller, SLOT(triggerItem(const QModelIndex&))); + this, SLOT(triggerItem(const QModelIndex&))); } connect(this, SIGNAL(viewportEntered()), controller, SLOT(emitViewportEntered())); - connect(controller, SIGNAL(showPreviewChanged(bool)), - this, SLOT(slotShowPreviewChanged(bool))); - connect(controller, SIGNAL(additionalInfoCountChanged(int)), - this, SLOT(slotAdditionalInfoCountChanged(int))); connect(controller, SIGNAL(zoomIn()), this, SLOT(zoomIn())); connect(controller, SIGNAL(zoomOut()), this, SLOT(zoomOut())); + const DolphinView* view = controller->dolphinView(); + connect(view, SIGNAL(showPreviewChanged()), + this, SLOT(slotShowPreviewChanged())); + connect(view, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)), + this, SLOT(slotAdditionalInfoChanged(const KFileItemDelegate::InformationList&))); + connect(this, SIGNAL(entered(const QModelIndex&)), this, SLOT(slotEntered(const QModelIndex&))); @@ -86,7 +93,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle m_viewOptions.font = font; setWordWrap(settings->numberOfTextlines() > 1); - updateGridSize(controller->showPreview(), controller->additionalInfoCount()); + updateGridSize(view->showPreview(), 0); if (settings->arrangement() == QListView::TopToBottom) { setFlow(QListView::LeftToRight); @@ -99,6 +106,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle m_categoryDrawer = new DolphinCategoryDrawer(); setCategoryDrawer(m_categoryDrawer); + + setFocus(); } DolphinIconsView::~DolphinIconsView() @@ -133,6 +142,19 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const itemRect.setHeight(maxHeight); } + 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; + itemRect.moveLeft(gridIndex * gridWidth + margin); + } + return itemRect; } @@ -149,7 +171,7 @@ void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event) void DolphinIconsView::mousePressEvent(QMouseEvent* event) { - m_controller->triggerActivation(); + m_controller->requestActivation(); if (!indexAt(event->pos()).isValid()) { const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) { @@ -160,6 +182,14 @@ void DolphinIconsView::mousePressEvent(QMouseEvent* event) KCategorizedView::mousePressEvent(event); } +void DolphinIconsView::startDrag(Qt::DropActions supportedActions) +{ + // TODO: invoking KCategorizedView::startDrag() should not be necessary, we'll + // fix this in KDE 4.1 + KCategorizedView::startDrag(supportedActions); + DragAndDropHelper::startDrag(this, supportedActions); +} + void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event) { if (event->mimeData()->hasUrls()) { @@ -184,7 +214,14 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* 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); + + m_dropRect.setSize(QSize()); // set as invalid + if (index.isValid()) { + const KFileItem item = itemForIndex(index); + if (!item.isNull() && item.isDir()) { + m_dropRect = visualRect(index); + } + } setDirtyRegion(m_dropRect); } @@ -193,15 +230,17 @@ void DolphinIconsView::dropEvent(QDropEvent* event) if (!selectionModel()->isSelected(indexAt(event->pos()))) { const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); if (!urls.isEmpty()) { + const QModelIndex index = indexAt(event->pos()); + const KFileItem item = itemForIndex(index); m_controller->indicateDroppedUrls(urls, m_controller->url(), - indexAt(event->pos()), - event->source()); + item); event->acceptProposedAction(); } } KCategorizedView::dropEvent(event); + m_dragging = false; } @@ -212,7 +251,7 @@ void DolphinIconsView::paintEvent(QPaintEvent* 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); + DragAndDropHelper::drawHoverIndication(viewport(), m_dropRect, brush); } } @@ -222,32 +261,35 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event) const QItemSelectionModel* selModel = selectionModel(); const QModelIndex currentIndex = selModel->currentIndex(); - const bool triggerItem = currentIndex.isValid() - && (event->key() == Qt::Key_Return) - && (selModel->selectedIndexes().count() <= 1); - if (triggerItem) { - m_controller->triggerItem(currentIndex); + const bool trigger = currentIndex.isValid() + && (event->key() == Qt::Key_Return) + && (selModel->selectedIndexes().count() <= 1); + if (trigger) { + triggerItem(currentIndex); } } -void DolphinIconsView::slotEntered(const QModelIndex& index) +void DolphinIconsView::triggerItem(const QModelIndex& index) { - QAbstractProxyModel* proxyModel = static_cast(model()); - KDirModel* dirModel = static_cast(proxyModel->sourceModel()); - const QModelIndex dirIndex = proxyModel->mapToSource(index); + m_controller->triggerItem(itemForIndex(index)); +} - const KFileItem item = dirModel->itemForIndex(dirIndex); - m_controller->emitItemEntered(item); +void DolphinIconsView::slotEntered(const QModelIndex& index) +{ + m_controller->emitItemEntered(itemForIndex(index)); } -void DolphinIconsView::slotShowPreviewChanged(bool showPreview) +void DolphinIconsView::slotShowPreviewChanged() { - updateGridSize(showPreview, m_controller->additionalInfoCount()); + const DolphinView* view = m_controller->dolphinView(); + const int infoCount = view->additionalInfo().count(); + updateGridSize(view->showPreview(), infoCount); } -void DolphinIconsView::slotAdditionalInfoCountChanged(int count) +void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info) { - updateGridSize(m_controller->showPreview(), count); + const bool showPreview = m_controller->dolphinView()->showPreview(); + updateGridSize(showPreview, info.count()); } void DolphinIconsView::zoomIn() @@ -258,7 +300,7 @@ void DolphinIconsView::zoomIn() const int oldIconSize = settings->iconSize(); int newIconSize = oldIconSize; - const bool showPreview = m_controller->showPreview(); + const bool showPreview = m_controller->dolphinView()->showPreview(); if (showPreview) { const int previewSize = increasedIconSize(settings->previewSize()); settings->setPreviewSize(previewSize); @@ -276,7 +318,8 @@ void DolphinIconsView::zoomIn() settings->setItemWidth(settings->itemWidth() + diff); settings->setItemHeight(settings->itemHeight() + diff); - updateGridSize(showPreview, m_controller->additionalInfoCount()); + const int infoCount = m_controller->dolphinView()->additionalInfo().count(); + updateGridSize(showPreview, infoCount); } } @@ -288,7 +331,7 @@ void DolphinIconsView::zoomOut() const int oldIconSize = settings->iconSize(); int newIconSize = oldIconSize; - const bool showPreview = m_controller->showPreview(); + const bool showPreview = m_controller->dolphinView()->showPreview(); if (showPreview) { const int previewSize = decreasedIconSize(settings->previewSize()); settings->setPreviewSize(previewSize); @@ -307,21 +350,24 @@ void DolphinIconsView::zoomOut() settings->setItemWidth(settings->itemWidth() - diff); settings->setItemHeight(settings->itemHeight() - diff); - updateGridSize(showPreview, m_controller->additionalInfoCount()); + const int infoCount = m_controller->dolphinView()->additionalInfo().count(); + updateGridSize(showPreview, infoCount); } } bool DolphinIconsView::isZoomInPossible() const { IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); - const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize(); + const bool showPreview = m_controller->dolphinView()->showPreview(); + const int size = showPreview ? settings->previewSize() : settings->iconSize(); return size < KIconLoader::SizeEnormous; } bool DolphinIconsView::isZoomOutPossible() const { IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); - const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize(); + const bool showPreview = m_controller->dolphinView()->showPreview(); + const int size = showPreview ? settings->previewSize() : settings->iconSize(); return size > KIconLoader::SizeSmall; } @@ -385,7 +431,7 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) } const int spacing = settings->gridSpacing(); - setGridSize(QSize(itemWidth + spacing, itemHeight + spacing)); + setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing)); m_itemSize = QSize(itemWidth, itemHeight); @@ -393,4 +439,12 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) m_controller->setZoomOutPossible(isZoomOutPossible()); } +KFileItem DolphinIconsView::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); +} + #include "dolphiniconsview.moc"