X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e46003aca365ca66ce7c7cccd47fb52d1da2fb91..bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index c04a70fab..45fbf25b2 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -23,7 +23,9 @@ #include "dolphincontroller.h" #include "dolphinsettings.h" #include "dolphin_iconsmodesettings.h" +#include "dolphin_generalsettings.h" #include "draganddrophelper.h" +#include "selectionmanager.h" #include #include @@ -33,13 +35,17 @@ #include #include #include +#include DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) : 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() { Q_ASSERT(controller != 0); @@ -51,7 +57,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle viewport()->setAcceptDrops(true); setMouseTracking(true); - viewport()->setAttribute(Qt::WA_Hover); // 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 @@ -59,11 +64,20 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle // RETURN-key in keyPressEvent(). if (KGlobalSettings::singleClick()) { connect(this, SIGNAL(clicked(const QModelIndex&)), - this, SLOT(triggerItem(const QModelIndex&))); + controller, SLOT(triggerItem(const QModelIndex&))); + if (DolphinSettings::instance().generalSettings()->showSelectionToggle()) { + SelectionManager* selManager = new SelectionManager(this); + connect(selManager, SIGNAL(selectionChanged()), + this, SLOT(requestActivation())); + connect(m_controller, SIGNAL(urlChanged(const KUrl&)), + selManager, SLOT(reset())); + } } else { connect(this, SIGNAL(doubleClicked(const QModelIndex&)), - this, SLOT(triggerItem(const QModelIndex&))); + controller, 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(zoomIn()), @@ -74,40 +88,42 @@ 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(this, SIGNAL(entered(const QModelIndex&)), - this, SLOT(slotEntered(const QModelIndex&))); + connect(view, SIGNAL(additionalInfoChanged()), + this, SLOT(slotAdditionalInfoChanged())); // apply the icons mode settings to the widget 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; + if (settings->useSystemFont()) { + m_font = KGlobalSettings::generalFont(); + } else { + m_font = QFont(settings->fontFamily(), + settings->fontSize(), + settings->fontWeight(), + settings->italicFont()); + } 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(); setCategoryDrawer(m_categoryDrawer); setFocus(); + + connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()), + this, SLOT(updateFont())); } DolphinIconsView::~DolphinIconsView() @@ -121,6 +137,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(); @@ -142,13 +159,18 @@ QRect DolphinIconsView::visualRect(const QModelIndex& index) const itemRect.setHeight(maxHeight); } - if (leftToRightFlow && bypassVisualRectIssue()) { - // TODO: check inline comment inside bypassVisualRectIssue() for details + 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); + const int centerInc = (maxWidth - itemRect.width()) / 2; + itemRect.moveLeft((gridIndex * gridWidth) + margin + centerInc); } return itemRect; @@ -156,7 +178,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) @@ -180,12 +208,10 @@ void DolphinIconsView::mousePressEvent(QMouseEvent* event) void DolphinIconsView::startDrag(Qt::DropActions supportedActions) { - if (bypassVisualRectIssue()) { - // TODO: check inline comment inside bypassVisualRectIssue() for details - DragAndDropHelper::startDrag(this, supportedActions); - } else { - KCategorizedView::startDrag(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) @@ -193,40 +219,36 @@ void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event) if (event->mimeData()->hasUrls()) { event->acceptProposedAction(); } - m_dragging = true; } void DolphinIconsView::dragLeaveEvent(QDragLeaveEvent* event) { - if (bypassVisualRectIssue()) { - // TODO: check inline comment inside bypassVisualRectIssue() for details - QAbstractItemView::dragLeaveEvent(event); - } else { - KCategorizedView::dragLeaveEvent(event); - } - - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - m_dragging = false; + KCategorizedView::dragLeaveEvent(event); setDirtyRegion(m_dropRect); } void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event) { - if (bypassVisualRectIssue()) { - // TODO: check inline comment inside bypassVisualRectIssue() for details - QAbstractItemView::dragMoveEvent(event); - } else { - KCategorizedView::dragMoveEvent(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); - 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 = m_controller->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); } @@ -236,7 +258,7 @@ void DolphinIconsView::dropEvent(QDropEvent* event) const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); if (!urls.isEmpty()) { const QModelIndex index = indexAt(event->pos()); - const KFileItem item = itemForIndex(index); + const KFileItem item = m_controller->itemForIndex(index); m_controller->indicateDroppedUrls(urls, m_controller->url(), item); @@ -244,62 +266,49 @@ void DolphinIconsView::dropEvent(QDropEvent* event) } } - if (bypassVisualRectIssue()) { - // TODO: check inline comment inside bypassVisualRectIssue() for details - QAbstractItemView::dropEvent(event); - } else { - 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); - DragAndDropHelper::drawHoverIndication(viewport(), m_dropRect, brush); - } + KCategorizedView::dropEvent(event); } void DolphinIconsView::keyPressEvent(QKeyEvent* event) { KCategorizedView::keyPressEvent(event); - - const QItemSelectionModel* selModel = selectionModel(); - const QModelIndex currentIndex = selModel->currentIndex(); - const bool trigger = currentIndex.isValid() - && (event->key() == Qt::Key_Return) - && (selModel->selectedIndexes().count() <= 1); - if (trigger) { - triggerItem(currentIndex); - } + m_controller->handleKeyPressEvent(event); } -void DolphinIconsView::triggerItem(const QModelIndex& index) +void DolphinIconsView::wheelEvent(QWheelEvent* event) { - m_controller->triggerItem(itemForIndex(index)); -} - -void DolphinIconsView::slotEntered(const QModelIndex& index) -{ - m_controller->emitItemEntered(itemForIndex(index)); + // let Ctrl+wheel events propagate to the DolphinView for icon zooming + if (event->modifiers() & Qt::ControlModifier) { + event->ignore(); + return; + } + KCategorizedView::wheelEvent(event); + // if the icons are aligned left to right, the vertical wheel event should + // be applied to the horizontal scrollbar + const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); + const bool scrollHorizontal = (event->orientation() == Qt::Vertical) && + (settings->arrangement() == QListView::LeftToRight); + if (scrollHorizontal) { + QWheelEvent horizEvent(event->pos(), + event->delta(), + event->buttons(), + event->modifiers(), + Qt::Horizontal); + QApplication::sendEvent(horizontalScrollBar(), &horizEvent); + } } 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() @@ -317,10 +326,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 @@ -328,8 +333,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()); } } @@ -345,11 +349,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); @@ -360,8 +359,22 @@ 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()); + } +} + +void DolphinIconsView::requestActivation() +{ + m_controller->requestActivation(); +} + +void DolphinIconsView::updateFont() +{ + const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); + Q_ASSERT(settings != 0); + + if (settings->useSystemFont()) { + m_font = KGlobalSettings::generalFont(); } } @@ -421,7 +434,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; @@ -429,49 +441,32 @@ 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); + setIconSize(QSize(itemWidth, size)); } else { - m_viewOptions.decorationSize = QSize(size, size); + m_decorationSize = QSize(size, size); + setIconSize(QSize(size, size)); } + m_itemSize = QSize(itemWidth, itemHeight); + const int spacing = settings->gridSpacing(); setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing)); - m_itemSize = QSize(itemWidth, itemHeight); - m_controller->setZoomInPossible(isZoomInPossible()); 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); -} - -bool DolphinIconsView::bypassVisualRectIssue() const +int DolphinIconsView::additionalInfoCount() const { - // 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 - // inside DolphinIconsView::visualRect(), but internally QListView does not use - // visualRect() but the (non-virtual) QListView::rectForIndex(). This leads - // to problems in combination with drag & drop operations: visual fragments get - // created. To bypass the drag & drop issue the calls for QListView::dragMoveEvent(), - // QListView::dropEvent() are replaced by the QAbstractItemView counterparts and - // QAbstractItemView::startDrag() has been reimplemented. - // - // 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. - KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast(model()); - return !proxyModel->isCategorizedModel(); + const DolphinView* view = m_controller->dolphinView(); + return view->additionalInfo().count(); } #include "dolphiniconsview.moc"