X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/40cd135f4dc7ae5ffacf8095fcf6e9fca9c04d45..d324e790d62c8a341abd06e845f8fe8d64aa8ef3:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 55d70a0a2..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 * @@ -22,28 +22,29 @@ #include "dolphincategorydrawer.h" #include "dolphincontroller.h" #include "settings/dolphinsettings.h" -#include "dolphinviewautoscroller.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_controller(controller), - m_selectionManager(0), - m_autoScroller(0), m_categoryDrawer(0), + m_extensionsFactory(0), m_font(), m_decorationSize(), m_decorationPosition(QStyleOptionViewItem::Top), @@ -52,6 +53,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle m_dropRect() { Q_ASSERT(controller != 0); + setModel(proxyModel); setLayoutDirection(Qt::LeftToRight); setViewMode(QListView::IconMode); setResizeMode(QListView::Adjust); @@ -61,7 +63,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle viewport()->setAcceptDrops(true); setMouseTracking(true); - m_autoScroller = new DolphinViewAutoScroller(this); connect(this, SIGNAL(clicked(const QModelIndex&)), controller, SLOT(requestTab(const QModelIndex&))); @@ -73,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()), @@ -108,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); @@ -127,6 +119,9 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle connect(KGlobalSettings::self(), SIGNAL(settingsChanged(int)), this, SLOT(slotGlobalSettingsChanged(int))); + + updateGridSize(view->showPreview(), 0); + m_extensionsFactory = new ViewExtensionsFactory(this, controller); } DolphinIconsView::~DolphinIconsView() @@ -192,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); } @@ -207,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); @@ -241,16 +231,14 @@ 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); - - KCategorizedView::dropEvent(event); } QModelIndex DolphinIconsView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) { - QModelIndex current = currentIndex(); + const QModelIndex oldCurrent = currentIndex(); - QModelIndex newCurrent = QListView::moveCursor(cursorAction, modifiers); - if (newCurrent != current) { + QModelIndex newCurrent = KCategorizedView::moveCursor(cursorAction, modifiers); + if (newCurrent != oldCurrent) { return newCurrent; } @@ -264,44 +252,36 @@ QModelIndex DolphinIconsView::moveCursor(CursorAction cursorAction, Qt::Keyboard if (newCurrent.row() == 0) { return newCurrent; } - newCurrent = QListView::moveCursor(MoveLeft, modifiers); + newCurrent = KCategorizedView::moveCursor(MoveLeft, modifiers); selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::NoUpdate); - newCurrent = QListView::moveCursor(MovePageDown, modifiers); + newCurrent = KCategorizedView::moveCursor(MovePageDown, modifiers); break; case MoveDown: if (newCurrent.row() == (model()->rowCount() - 1)) { return newCurrent; } - newCurrent = QListView::moveCursor(MovePageUp, modifiers); - selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::Clear); - newCurrent = QListView::moveCursor(MoveRight, modifiers); + 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 = QListView::moveCursor(MoveUp, modifiers); + newCurrent = KCategorizedView::moveCursor(MoveUp, modifiers); do { selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::NoUpdate); current = newCurrent; - newCurrent = QListView::moveCursor(MoveRight, modifiers); + newCurrent = KCategorizedView::moveCursor(MoveRight, modifiers); } while (newCurrent != current); - - if (!(modifiers & Qt::ControlModifier)) { - // Ctrl is not pressed -> selection is updated - if (!(modifiers & Qt::ShiftModifier)) { - // Shift is not pressed -> previous selection is lost - selectionModel()->clearSelection(); - } - selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::Select); - } break; case MoveRight: @@ -311,9 +291,9 @@ QModelIndex DolphinIconsView::moveCursor(CursorAction cursorAction, Qt::Keyboard do { selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::NoUpdate); current = newCurrent; - newCurrent = QListView::moveCursor(MoveLeft, modifiers); + newCurrent = KCategorizedView::moveCursor(MoveLeft, modifiers); } while (newCurrent != current); - newCurrent = QListView::moveCursor(MoveDown, modifiers); + newCurrent = KCategorizedView::moveCursor(MoveDown, modifiers); break; default: @@ -321,6 +301,8 @@ QModelIndex DolphinIconsView::moveCursor(CursorAction cursorAction, Qt::Keyboard } } + // Revert all changes of the current item to make sure that item selection works correctly + selectionModel()->setCurrentIndex(oldCurrent, QItemSelectionModel::NoUpdate); return newCurrent; } @@ -332,16 +314,6 @@ void DolphinIconsView::keyPressEvent(QKeyEvent* event) 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); @@ -381,7 +353,7 @@ void DolphinIconsView::leaveEvent(QEvent* event) void DolphinIconsView::currentChanged(const QModelIndex& current, const QModelIndex& previous) { KCategorizedView::currentChanged(current, previous); - m_autoScroller->handleCurrentIndexChange(current, previous); + m_extensionsFactory->handleCurrentIndexChange(current, previous); } void DolphinIconsView::resizeEvent(QResizeEvent* event) @@ -513,16 +485,12 @@ void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount) } m_itemSize = QSize(itemWidth, itemHeight); - 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