X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/148282e2d856b47ceb191eeef4c834118c8cdffd..2b951e61fa86a53415ed6e8f7a2ac3961a6480c0:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index b95de351a..e7448ed6d 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at) * + * Copyright (C) 2006-2009 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -21,29 +21,30 @@ #include "dolphincategorydrawer.h" #include "dolphincontroller.h" -#include "dolphinsettings.h" -#include "dolphinviewautoscroller.h" +#include "settings/dolphinsettings.h" +#include "dolphinsortfilterproxymodel.h" #include "dolphin_iconsmodesettings.h" #include "dolphin_generalsettings.h" #include "draganddrophelper.h" #include "selectionmanager.h" +#include "viewextensionsfactory.h" #include "zoomlevelinfo.h" #include #include -#include #include #include #include #include -DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) : +DolphinIconsView::DolphinIconsView(QWidget* parent, + DolphinController* controller, + DolphinSortFilterProxyModel* proxyModel) : KCategorizedView(parent), - m_enableScrollTo(false), m_controller(controller), - m_selectionManager(0), m_categoryDrawer(0), + m_extensionsFactory(0), m_font(), m_decorationSize(), m_decorationPosition(QStyleOptionViewItem::Top), @@ -52,17 +53,16 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle m_dropRect() { Q_ASSERT(controller != 0); + setModel(proxyModel); setLayoutDirection(Qt::LeftToRight); setViewMode(QListView::IconMode); setResizeMode(QListView::Adjust); - setSpacing(KDialog::spacingHint()); setMovement(QListView::Static); setDragEnabled(true); setEditTriggers(QAbstractItemView::NoEditTriggers); viewport()->setAcceptDrops(true); setMouseTracking(true); - new DolphinViewAutoScroller(this); connect(this, SIGNAL(clicked(const QModelIndex&)), controller, SLOT(requestTab(const QModelIndex&))); @@ -74,14 +74,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle controller, SLOT(triggerItem(const QModelIndex&))); } - if (DolphinSettings::instance().generalSettings()->showSelectionToggle()) { - m_selectionManager = new SelectionManager(this); - connect(m_selectionManager, SIGNAL(selectionChanged()), - this, SLOT(requestActivation())); - connect(m_controller, SIGNAL(urlChanged(const KUrl&)), - m_selectionManager, SLOT(reset())); - } - connect(this, SIGNAL(entered(const QModelIndex&)), controller, SLOT(emitItemEntered(const QModelIndex&))); connect(this, SIGNAL(viewportEntered()), @@ -109,7 +101,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle } setWordWrap(settings->numberOfTextlines() > 1); - updateGridSize(view->showPreview(), 0); if (settings->arrangement() == QListView::TopToBottom) { setFlow(QListView::LeftToRight); @@ -126,8 +117,11 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle setFocus(); - connect(KGlobalSettings::self(), SIGNAL(kdisplayFontChanged()), - this, SLOT(updateFont())); + connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)), + this, SLOT(slotGlobalSettingsChanged(int))); + + updateGridSize(view->showPreview(), 0); + m_extensionsFactory = new ViewExtensionsFactory(this, controller); } DolphinIconsView::~DolphinIconsView() @@ -136,19 +130,6 @@ DolphinIconsView::~DolphinIconsView() m_categoryDrawer = 0; } -void DolphinIconsView::scrollTo(const QModelIndex& index, ScrollHint hint) -{ - // Enable the QListView implementation of scrollTo() only if it has been - // triggered by a key press. Otherwise QAbstractItemView wants to scroll to the current - // index each time the layout has been changed. This becomes an issue when - // previews are loaded and the scrollbar is used: the scrollbar will always - // be reset to 0 on each new preview. - if (m_enableScrollTo || (state() != QAbstractItemView::NoState)) { - KCategorizedView::scrollTo(index, hint); - m_enableScrollTo = false; - } -} - void DolphinIconsView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight) { KCategorizedView::dataChanged(topLeft, bottomRight); @@ -206,9 +187,6 @@ void DolphinIconsView::mousePressEvent(QMouseEvent* 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::instance().startDrag(this, supportedActions, m_controller); } @@ -221,14 +199,12 @@ void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event) void DolphinIconsView::dragLeaveEvent(QDragLeaveEvent* event) { - KCategorizedView::dragLeaveEvent(event); + Q_UNUSED(event); setDirtyRegion(m_dropRect); } void DolphinIconsView::dragMoveEvent(QDragMoveEvent* 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); @@ -255,32 +231,92 @@ void DolphinIconsView::dropEvent(QDropEvent* event) const QModelIndex index = indexAt(event->pos()); const KFileItem item = m_controller->itemForIndex(index); m_controller->indicateDroppedUrls(item, m_controller->url(), event); +} + +QModelIndex DolphinIconsView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) +{ + const QModelIndex oldCurrent = currentIndex(); + + QModelIndex newCurrent = KCategorizedView::moveCursor(cursorAction, modifiers); + if (newCurrent != oldCurrent) { + return newCurrent; + } + + // The cursor has not been moved by the base implementation. Provide a + // wrap behavior, so that the cursor will go to the next item when reaching + // the border. + const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); + if (settings->arrangement() == QListView::LeftToRight) { + switch (cursorAction) { + case MoveUp: + if (newCurrent.row() == 0) { + return newCurrent; + } + newCurrent = KCategorizedView::moveCursor(MoveLeft, modifiers); + selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::NoUpdate); + newCurrent = KCategorizedView::moveCursor(MovePageDown, modifiers); + break; + + case MoveDown: + if (newCurrent.row() == (model()->rowCount() - 1)) { + return newCurrent; + } + newCurrent = KCategorizedView::moveCursor(MovePageUp, modifiers); + selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::NoUpdate); + newCurrent = KCategorizedView::moveCursor(MoveRight, modifiers); + break; + + default: + break; + } + } else { + QModelIndex current = oldCurrent; + switch (cursorAction) { + case MoveLeft: + if (newCurrent.row() == 0) { + return newCurrent; + } + newCurrent = KCategorizedView::moveCursor(MoveUp, modifiers); + do { + selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::NoUpdate); + current = newCurrent; + newCurrent = KCategorizedView::moveCursor(MoveRight, modifiers); + } while (newCurrent != current); + break; + + case MoveRight: + if (newCurrent.row() == (model()->rowCount() - 1)) { + return newCurrent; + } + do { + selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::NoUpdate); + current = newCurrent; + newCurrent = KCategorizedView::moveCursor(MoveLeft, modifiers); + } while (newCurrent != current); + newCurrent = KCategorizedView::moveCursor(MoveDown, modifiers); + break; + + default: + break; + } + } - KCategorizedView::dropEvent(event); + // Revert all changes of the current item to make sure that item selection works correctly + selectionModel()->setCurrentIndex(oldCurrent, QItemSelectionModel::NoUpdate); + return newCurrent; } void DolphinIconsView::keyPressEvent(QKeyEvent* event) { KCategorizedView::keyPressEvent(event); m_controller->handleKeyPressEvent(event); - m_enableScrollTo = true; // see DolphinIconsView::scrollTo() } void DolphinIconsView::wheelEvent(QWheelEvent* event) { - if (m_selectionManager != 0) { - m_selectionManager->reset(); - } - - // let Ctrl+wheel events propagate to the DolphinView for icon zooming - if (event->modifiers() & Qt::ControlModifier) { - event->ignore(); - return; - } - horizontalScrollBar()->setSingleStep(m_itemSize.width() / 10); verticalScrollBar()->setSingleStep(m_itemSize.height() / 10); - + KCategorizedView::wheelEvent(event); // if the icons are aligned left to right, the vertical wheel event should // be applied to the horizontal scrollbar @@ -314,6 +350,19 @@ void DolphinIconsView::leaveEvent(QEvent* event) m_controller->emitViewportEntered(); } +void DolphinIconsView::currentChanged(const QModelIndex& current, const QModelIndex& previous) +{ + KCategorizedView::currentChanged(current, previous); + m_extensionsFactory->handleCurrentIndexChange(current, previous); +} + +void DolphinIconsView::resizeEvent(QResizeEvent* event) +{ + KCategorizedView::resizeEvent(event); + const DolphinView* view = m_controller->dolphinView(); + updateGridSize(view->showPreview(), view->additionalInfo().count()); +} + void DolphinIconsView::slotShowPreviewChanged() { const DolphinView* view = m_controller->dolphinView(); @@ -356,14 +405,23 @@ void DolphinIconsView::requestActivation() m_controller->requestActivation(); } -void DolphinIconsView::updateFont() +void DolphinIconsView::slotGlobalSettingsChanged(int category) { + Q_UNUSED(category); + const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); Q_ASSERT(settings != 0); - if (settings->useSystemFont()) { m_font = KGlobalSettings::generalFont(); } + + disconnect(this, SIGNAL(clicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex))); + disconnect(this, SIGNAL(doubleClicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex))); + if (KGlobalSettings::singleClick()) { + connect(this, SIGNAL(clicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex))); + } else { + connect(this, SIGNAL(doubleClicked(QModelIndex)), m_controller, SLOT(triggerItem(QModelIndex))); + } } void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) @@ -387,30 +445,52 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) Q_ASSERT(additionalInfoCount >= 0); itemHeight += additionalInfoCount * m_font.pointSize() * 2; + // Optimize the item size of the grid in a way to prevent large gaps on the + // right border (= row arrangement) or the bottom border (= column arrangement). + // There is no public API in QListView to find out the used width of the viewport + // for the layout. The following calculation of 'contentWidth'/'contentHeight' + // is based on QListViewPrivate::prepareItemsLayout() (Copyright (C) 2009 Nokia Corporation). + int frameAroundContents = 0; + if (style()->styleHint(QStyle::SH_ScrollView_FrameOnlyAroundContents)) { + frameAroundContents = style()->pixelMetric(QStyle::PM_DefaultFrameWidth) * 2; + } + const int spacing = settings->gridSpacing(); if (settings->arrangement() == QListView::TopToBottom) { + const int contentWidth = viewport()->width() - 1 + - frameAroundContents + - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, horizontalScrollBar()); + const int gridWidth = itemWidth + spacing * 2; + const int horizItemCount = contentWidth / gridWidth; + if (horizItemCount > 0) { + itemWidth += (contentWidth - horizItemCount * gridWidth) / horizItemCount; + } + // 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_decorationSize = QSize(itemWidth, size); setIconSize(QSize(itemWidth, size)); } else { + const int contentHeight = viewport()->height() - 1 + - frameAroundContents + - style()->pixelMetric(QStyle::PM_ScrollBarExtent, 0, verticalScrollBar()); + const int gridHeight = itemHeight + spacing; + const int vertItemCount = contentHeight / gridHeight; + if (vertItemCount > 0) { + itemHeight += (contentHeight - vertItemCount * gridHeight) / vertItemCount; + } + 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)); + setGridSizeOwn(QSize(itemWidth + spacing * 2, itemHeight + spacing)); KFileItemDelegate* delegate = dynamic_cast(itemDelegate()); if (delegate != 0) { delegate->setMaximumSize(m_itemSize); } - - if (m_selectionManager != 0) { - m_selectionManager->reset(); - } } int DolphinIconsView::additionalInfoCount() const