X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/be9746e87bb6a42e641dbf36c528a60fb564420a..dbc8874c00c35aaefacdd03f8aef9e4ac4e2be01:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index d21ffba32..9e2d3ee02 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -19,29 +19,38 @@ #include "dolphiniconsview.h" +#include "dolphincategorydrawer.h" #include "dolphincontroller.h" #include "dolphinsettings.h" -#include "dolphinitemcategorizer.h" #include "dolphin_iconsmodesettings.h" +#include + #include #include #include #include DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) : - KListView(parent), + KCategorizedView(parent), m_controller(controller), - m_dragging(false) + m_categoryDrawer(0), + m_itemSize(), + m_dragging(false), + m_dropRect() { Q_ASSERT(controller != 0); setViewMode(QListView::IconMode); setResizeMode(QListView::Adjust); - + setSpacing(KDialog::spacingHint()); 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 + // necessary connecting the signal 'singleClick()' or 'doubleClick' and to handle the + // RETURN-key in keyPressEvent(). if (KGlobalSettings::singleClick()) { connect(this, SIGNAL(clicked(const QModelIndex&)), controller, SLOT(triggerItem(const QModelIndex&))); @@ -49,8 +58,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle connect(this, SIGNAL(doubleClicked(const QModelIndex&)), controller, SLOT(triggerItem(const QModelIndex&))); } - connect(this, SIGNAL(activated(const QModelIndex&)), - controller, SLOT(triggerItem(const QModelIndex&))); connect(this, SIGNAL(entered(const QModelIndex&)), controller, SLOT(emitItemEntered(const QModelIndex&))); connect(this, SIGNAL(viewportEntered()), @@ -68,7 +75,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); Q_ASSERT(settings != 0); - m_viewOptions = KListView::viewOptions(); + m_viewOptions = KCategorizedView::viewOptions(); m_viewOptions.showDecorationSelected = true; QFont font(settings->fontFamily(), settings->fontSize()); @@ -87,10 +94,44 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle m_viewOptions.decorationPosition = QStyleOptionViewItem::Left; m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter; } + + m_categoryDrawer = new DolphinCategoryDrawer(); + setCategoryDrawer(m_categoryDrawer); } DolphinIconsView::~DolphinIconsView() { + delete m_categoryDrawer; + m_categoryDrawer = 0; +} + +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(); + + if (itemRect.width() > maxWidth) { + // assure that the maximum item width is not exceeded + if (leftToRightFlow) { + const int left = itemRect.left() + (itemRect.width() - maxWidth) / 2; + itemRect.setLeft(left); + } + itemRect.setWidth(maxWidth); + } + + if (itemRect.height() > maxHeight) { + // assure that the maximum item height is not exceeded + if (!leftToRightFlow) { + const int top = itemRect.top() + (itemRect.height() - maxHeight) / 2; + itemRect.setTop(top); + } + itemRect.setHeight(maxHeight); + } + + return itemRect; } QStyleOptionViewItem DolphinIconsView::viewOptions() const @@ -100,7 +141,7 @@ QStyleOptionViewItem DolphinIconsView::viewOptions() const void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event) { - KListView::contextMenuEvent(event); + KCategorizedView::contextMenuEvent(event); m_controller->triggerContextMenuRequest(event->pos()); } @@ -114,7 +155,7 @@ void DolphinIconsView::mousePressEvent(QMouseEvent* event) } } - KListView::mousePressEvent(event); + KCategorizedView::mousePressEvent(event); } void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event) @@ -127,7 +168,7 @@ void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event) void DolphinIconsView::dragLeaveEvent(QDragLeaveEvent* event) { - KListView::dragLeaveEvent(event); + KCategorizedView::dragLeaveEvent(event); // TODO: remove this code when the issue #160611 is solved in Qt 4.4 m_dragging = false; @@ -136,7 +177,7 @@ void DolphinIconsView::dragLeaveEvent(QDragLeaveEvent* event) void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event) { - KListView::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()); @@ -147,31 +188,43 @@ void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event) void DolphinIconsView::dropEvent(QDropEvent* event) { - const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); - if (!urls.isEmpty()) { - m_controller->indicateDroppedUrls(urls, - indexAt(event->pos()), - event->source()); - event->acceptProposedAction(); + if (!selectionModel()->isSelected(indexAt(event->pos()))) { + const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); + if (!urls.isEmpty()) { + m_controller->indicateDroppedUrls(urls, + m_controller->url(), + indexAt(event->pos()), + event->source()); + event->acceptProposedAction(); + } } - KListView::dropEvent(event); + + KCategorizedView::dropEvent(event); m_dragging = false; } void DolphinIconsView::paintEvent(QPaintEvent* event) { - KListView::paintEvent(event); + KCategorizedView::paintEvent(event); + // TODO: remove this code when the issue #160611 is solved in Qt 4.4 if (m_dragging) { - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - QPainter painter(viewport()); - painter.save(); - QBrush brush(m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight)); - QColor color = brush.color(); - color.setAlpha(64); - brush.setColor(color); - painter.fillRect(m_dropRect, brush); - painter.restore(); + const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight); + DolphinController::drawHoverIndication(viewport(), m_dropRect, brush); + } +} + +void DolphinIconsView::keyPressEvent(QKeyEvent* event) +{ + KCategorizedView::keyPressEvent(event); + + const QItemSelectionModel* selModel = selectionModel(); + const QModelIndex currentIndex = selModel->currentIndex(); + const bool triggerItem = currentIndex.isValid() + && (event->key() == Qt::Key_Return) + && (selModel->selectedIndexes().count() <= 1); + if (triggerItem) { + m_controller->triggerItem(currentIndex); } } @@ -250,26 +303,25 @@ bool DolphinIconsView::isZoomInPossible() const { IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize(); - return size < K3Icon::SizeEnormous; + return size < KIconLoader::SizeEnormous; } bool DolphinIconsView::isZoomOutPossible() const { IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize(); - return size > K3Icon::SizeSmall; + return size > KIconLoader::SizeSmall; } int DolphinIconsView::increasedIconSize(int size) const { - // TODO: get rid of K3Icon sizes int incSize = 0; switch (size) { - case K3Icon::SizeSmall: incSize = K3Icon::SizeSmallMedium; break; - case K3Icon::SizeSmallMedium: incSize = K3Icon::SizeMedium; break; - case K3Icon::SizeMedium: incSize = K3Icon::SizeLarge; break; - case K3Icon::SizeLarge: incSize = K3Icon::SizeHuge; break; - case K3Icon::SizeHuge: incSize = K3Icon::SizeEnormous; break; + case KIconLoader::SizeSmall: incSize = KIconLoader::SizeSmallMedium; break; + case KIconLoader::SizeSmallMedium: incSize = KIconLoader::SizeMedium; break; + case KIconLoader::SizeMedium: incSize = KIconLoader::SizeLarge; break; + case KIconLoader::SizeLarge: incSize = KIconLoader::SizeHuge; break; + case KIconLoader::SizeHuge: incSize = KIconLoader::SizeEnormous; break; default: Q_ASSERT(false); break; } return incSize; @@ -277,14 +329,13 @@ int DolphinIconsView::increasedIconSize(int size) const int DolphinIconsView::decreasedIconSize(int size) const { - // TODO: get rid of K3Icon sizes int decSize = 0; switch (size) { - case K3Icon::SizeSmallMedium: decSize = K3Icon::SizeSmall; break; - case K3Icon::SizeMedium: decSize = K3Icon::SizeSmallMedium; break; - case K3Icon::SizeLarge: decSize = K3Icon::SizeMedium; break; - case K3Icon::SizeHuge: decSize = K3Icon::SizeLarge; break; - case K3Icon::SizeEnormous: decSize = K3Icon::SizeHuge; break; + case KIconLoader::SizeSmallMedium: decSize = KIconLoader::SizeSmall; break; + case KIconLoader::SizeMedium: decSize = KIconLoader::SizeSmallMedium; break; + case KIconLoader::SizeLarge: decSize = KIconLoader::SizeMedium; break; + case KIconLoader::SizeHuge: decSize = KIconLoader::SizeLarge; break; + case KIconLoader::SizeEnormous: decSize = KIconLoader::SizeHuge; break; default: Q_ASSERT(false); break; } return decSize; @@ -325,6 +376,8 @@ void DolphinIconsView::updateGridSize(bool showPreview, bool showAdditionalInfo) const int spacing = settings->gridSpacing(); setGridSize(QSize(itemWidth + spacing, itemHeight + spacing)); + m_itemSize = QSize(itemWidth, itemHeight); + m_controller->setZoomInPossible(isZoomInPossible()); m_controller->setZoomOutPossible(isZoomOutPossible()); }