X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3c1c185400a55103cea3ed567de167df87b59945..e8bc9f1072bfc43d7605315c8df69f37bfc71cc3:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 6b584612c..ed2593c97 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -22,10 +22,11 @@ #include "dolphincategorydrawer.h" #include "dolphincontroller.h" #include "dolphinsettings.h" - #include "dolphin_iconsmodesettings.h" +#include #include +#include #include #include @@ -44,6 +45,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle setViewMode(QListView::IconMode); setResizeMode(QListView::Adjust); setSpacing(KDialog::spacingHint()); + setMovement(QListView::Snap); setMouseTracking(true); viewport()->setAttribute(Qt::WA_Hover); @@ -53,24 +55,27 @@ 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(entered(const QModelIndex&)), - controller, SLOT(emitItemEntered(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&))); + // apply the icons mode settings to the widget const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); Q_ASSERT(settings != 0); @@ -84,7 +89,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); @@ -97,6 +102,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle m_categoryDrawer = new DolphinCategoryDrawer(); setCategoryDrawer(m_categoryDrawer); + + setFocus(); } DolphinIconsView::~DolphinIconsView() @@ -131,6 +138,20 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const itemRect.setHeight(maxHeight); } + KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast(model()); + if (leftToRightFlow && !proxyModel->isCategorizedModel()) { + // TODO: This workaround bypasses a layout issue in QListView::visualRect(), where + // the horizontal position of items might get calculated in a wrong manner when the item + // name is too long. 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() / 2; + const int gridWidth = gridSize().width(); + int left = itemRect.left(); + left = ((left - margin + 1) / gridWidth) * gridWidth + margin; + itemRect.moveLeft(left); + } + return itemRect; } @@ -147,7 +168,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)) { @@ -182,7 +203,11 @@ 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); + if (itemForIndex(index).isDir()) { + m_dropRect = visualRect(index); + } else { + m_dropRect.setSize(QSize()); // set as invalid + } setDirtyRegion(m_dropRect); } @@ -191,10 +216,11 @@ 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(); } } @@ -220,22 +246,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::slotShowPreviewChanged(bool showPreview) +void DolphinIconsView::triggerItem(const QModelIndex& index) { - updateGridSize(showPreview, m_controller->additionalInfoCount()); + m_controller->triggerItem(itemForIndex(index)); } -void DolphinIconsView::slotAdditionalInfoCountChanged(int count) +void DolphinIconsView::slotEntered(const QModelIndex& index) { - updateGridSize(m_controller->showPreview(), count); + m_controller->emitItemEntered(itemForIndex(index)); +} + +void DolphinIconsView::slotShowPreviewChanged() +{ + const DolphinView* view = m_controller->dolphinView(); + const int infoCount = view->additionalInfo().count(); + updateGridSize(view->showPreview(), infoCount); +} + +void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info) +{ + const bool showPreview = m_controller->dolphinView()->showPreview(); + updateGridSize(showPreview, info.count()); } void DolphinIconsView::zoomIn() @@ -246,7 +285,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); @@ -264,7 +303,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); } } @@ -276,7 +316,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); @@ -295,21 +335,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; } @@ -381,4 +424,13 @@ 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"