X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e8bc9f1072bfc43d7605315c8df69f37bfc71cc3..9eb63ebe4f1235e5d11f12018b353c32dac5f651:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index ed2593c97..d3d485f1a 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -23,6 +23,7 @@ #include "dolphincontroller.h" #include "dolphinsettings.h" #include "dolphin_iconsmodesettings.h" +#include "draganddrophelper.h" #include #include @@ -37,6 +38,10 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle KCategorizedView(parent), m_controller(controller), m_categoryDrawer(0), + m_font(), + m_decorationSize(), + m_decorationPosition(QStyleOptionViewItem::Top), + m_displayAlignment(Qt::AlignHCenter), m_itemSize(), m_dragging(false), m_dropRect() @@ -45,7 +50,10 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle setViewMode(QListView::IconMode); setResizeMode(QListView::Adjust); setSpacing(KDialog::spacingHint()); - setMovement(QListView::Snap); + setMovement(QListView::Static); + setDragEnabled(true); + viewport()->setAcceptDrops(true); + setMouseTracking(true); viewport()->setAttribute(Qt::WA_Hover); @@ -70,8 +78,8 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle 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(view, SIGNAL(additionalInfoChanged()), + this, SLOT(slotAdditionalInfoChanged())); connect(this, SIGNAL(entered(const QModelIndex&)), this, SLOT(slotEntered(const QModelIndex&))); @@ -80,24 +88,21 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); Q_ASSERT(settings != 0); - 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; + m_font = QFont(settings->fontFamily(), settings->fontSize()); + m_font.setItalic(settings->italicFont()); + m_font.setBold(settings->boldFont()); setWordWrap(settings->numberOfTextlines() > 1); updateGridSize(view->showPreview(), 0); if (settings->arrangement() == QListView::TopToBottom) { setFlow(QListView::LeftToRight); - m_viewOptions.decorationPosition = QStyleOptionViewItem::Top; + m_decorationPosition = QStyleOptionViewItem::Top; + m_displayAlignment = Qt::AlignHCenter; } else { setFlow(QListView::TopToBottom); - m_viewOptions.decorationPosition = QStyleOptionViewItem::Left; - m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter; + m_decorationPosition = QStyleOptionViewItem::Left; + m_displayAlignment = Qt::AlignLeft | Qt::AlignVCenter; } m_categoryDrawer = new DolphinCategoryDrawer(); @@ -117,6 +122,7 @@ 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(); @@ -140,16 +146,16 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const 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. + // 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() / 2; + const int margin = settings->gridSpacing(); const int gridWidth = gridSize().width(); - int left = itemRect.left(); - left = ((left - margin + 1) / gridWidth) * gridWidth + margin; - itemRect.moveLeft(left); + const int gridIndex = (itemRect.left() - margin + 1) / gridWidth; + const int centerInc = (maxWidth - itemRect.width()) / 2; + itemRect.moveLeft((gridIndex * gridWidth) + margin + centerInc); } return itemRect; @@ -157,7 +163,13 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const QStyleOptionViewItem DolphinIconsView::viewOptions() const { - return m_viewOptions; + QStyleOptionViewItem viewOptions = KCategorizedView::viewOptions(); + viewOptions.font = m_font; + viewOptions.decorationPosition = m_decorationPosition; + viewOptions.decorationSize = m_decorationSize; + viewOptions.displayAlignment = m_displayAlignment; + viewOptions.showDecorationSelected = true; + return viewOptions; } void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event) @@ -179,6 +191,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()) { @@ -203,11 +223,21 @@ 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); - if (itemForIndex(index).isDir()) { - m_dropRect = visualRect(index); - } else { - m_dropRect.setSize(QSize()); // set as invalid + + m_dropRect.setSize(QSize()); // set as invalid + if (index.isValid()) { + const KFileItem item = itemForIndex(index); + if (!item.isNull() && item.isDir()) { + m_dropRect = visualRect(index); + } else { + m_dropRect.setSize(QSize()); // set as invalid + } + } + if (event->mimeData()->hasUrls()) { + // accept url drops, independently from the destination item + event->acceptProposedAction(); } + setDirtyRegion(m_dropRect); } @@ -226,6 +256,7 @@ void DolphinIconsView::dropEvent(QDropEvent* event) } KCategorizedView::dropEvent(event); + m_dragging = false; } @@ -235,8 +266,8 @@ 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); + const QBrush& brush = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight); + DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush); } } @@ -267,14 +298,14 @@ void DolphinIconsView::slotEntered(const QModelIndex& index) void DolphinIconsView::slotShowPreviewChanged() { const DolphinView* view = m_controller->dolphinView(); - const int infoCount = view->additionalInfo().count(); - updateGridSize(view->showPreview(), infoCount); + updateGridSize(view->showPreview(), additionalInfoCount()); } -void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info) +void DolphinIconsView::slotAdditionalInfoChanged() { - const bool showPreview = m_controller->dolphinView()->showPreview(); - updateGridSize(showPreview, info.count()); + const DolphinView* view = m_controller->dolphinView(); + const bool showPreview = view->showPreview(); + updateGridSize(showPreview, view->additionalInfo().count()); } void DolphinIconsView::zoomIn() @@ -303,8 +334,7 @@ void DolphinIconsView::zoomIn() settings->setItemWidth(settings->itemWidth() + diff); settings->setItemHeight(settings->itemHeight() + diff); - const int infoCount = m_controller->dolphinView()->additionalInfo().count(); - updateGridSize(showPreview, infoCount); + updateGridSize(showPreview, additionalInfoCount()); } } @@ -335,8 +365,7 @@ void DolphinIconsView::zoomOut() settings->setItemWidth(settings->itemWidth() - diff); settings->setItemHeight(settings->itemHeight() - diff); - const int infoCount = m_controller->dolphinView()->additionalInfo().count(); - updateGridSize(showPreview, infoCount); + updateGridSize(showPreview, additionalInfoCount()); } } @@ -404,22 +433,22 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) } Q_ASSERT(additionalInfoCount >= 0); - itemHeight += additionalInfoCount * m_viewOptions.font.pointSize() * 2; + itemHeight += additionalInfoCount * m_font.pointSize() * 2; 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); + m_decorationSize = QSize(itemWidth, size); } else { - m_viewOptions.decorationSize = QSize(size, size); + m_decorationSize = QSize(size, size); } - const int spacing = settings->gridSpacing(); - setGridSize(QSize(itemWidth + spacing, itemHeight + spacing)); - m_itemSize = QSize(itemWidth, itemHeight); + const int spacing = settings->gridSpacing(); + setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing)); + m_controller->setZoomInPossible(isZoomInPossible()); m_controller->setZoomOutPossible(isZoomOutPossible()); } @@ -432,5 +461,10 @@ KFileItem DolphinIconsView::itemForIndex(const QModelIndex& index) const return dirModel->itemForIndex(dirIndex); } +int DolphinIconsView::additionalInfoCount() const +{ + const DolphinView* view = m_controller->dolphinView(); + return view->additionalInfo().count(); +} #include "dolphiniconsview.moc"