X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e65154552769e648bcbe14429123ff9fcd48bd29..bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index a45b08dcf..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,6 +35,7 @@ #include #include #include +#include DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) : KCategorizedView(parent), @@ -43,7 +46,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle m_decorationPosition(QStyleOptionViewItem::Top), m_displayAlignment(Qt::AlignHCenter), m_itemSize(), - m_dragging(false), m_dropRect() { Q_ASSERT(controller != 0); @@ -55,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 @@ -63,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()), @@ -78,19 +88,21 @@ 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_font = QFont(settings->fontFamily(), settings->fontSize()); - m_font.setItalic(settings->italicFont()); - m_font.setBold(settings->boldFont()); + 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); @@ -109,6 +121,9 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle setCategoryDrawer(m_categoryDrawer); setFocus(); + + connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()), + this, SLOT(updateFont())); } DolphinIconsView::~DolphinIconsView() @@ -204,15 +219,11 @@ 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); } @@ -226,11 +237,18 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event) m_dropRect.setSize(QSize()); // set as invalid if (index.isValid()) { - const KFileItem item = itemForIndex(index); + 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); } @@ -240,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); @@ -249,43 +267,35 @@ void DolphinIconsView::dropEvent(QDropEvent* event) } 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 = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight); - DragAndDropHelper::drawHoverIndication(viewport(), m_dropRect, brush); - } } 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); - } -} - -void DolphinIconsView::triggerItem(const QModelIndex& index) -{ - m_controller->triggerItem(itemForIndex(index)); + m_controller->handleKeyPressEvent(event); } -void DolphinIconsView::slotEntered(const QModelIndex& index) +void DolphinIconsView::wheelEvent(QWheelEvent* event) { - 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() @@ -294,15 +304,11 @@ void DolphinIconsView::slotShowPreviewChanged() updateGridSize(view->showPreview(), additionalInfoCount()); } -void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info) +void DolphinIconsView::slotAdditionalInfoChanged() { - const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); - if (!settings->showAdditionalInfo()) { - return; - } - - 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() @@ -320,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 @@ -347,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); @@ -366,6 +363,21 @@ void DolphinIconsView::zoomOut() } } +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(); + } +} + bool DolphinIconsView::isZoomInPossible() const { IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); @@ -422,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; @@ -437,8 +448,10 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) // width for the text wrapping. To use the maximum item width // for text wrapping, it is used as decoration width. m_decorationSize = QSize(itemWidth, size); + setIconSize(QSize(itemWidth, size)); } else { m_decorationSize = QSize(size, size); + setIconSize(QSize(size, size)); } m_itemSize = QSize(itemWidth, itemHeight); @@ -450,19 +463,10 @@ 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); -} - int DolphinIconsView::additionalInfoCount() const { const DolphinView* view = m_controller->dolphinView(); - const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); - return settings->showAdditionalInfo() ? view->additionalInfo().count() : 0; + return view->additionalInfo().count(); } #include "dolphiniconsview.moc"