X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4dcb9b7a487ff1280fa4fd7a0d6566331ba31637..da795d20e2f2fa57ac9cafdffcfac4d092d8eaea:/src/dolphiniconsview.cpp diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index 0b9b1e6fa..73b631390 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -21,6 +21,7 @@ #include "dolphincontroller.h" #include "dolphinsettings.h" +#include "dolphinitemcategorizer.h" #include "dolphin_iconsmodesettings.h" @@ -28,25 +29,37 @@ #include #include -#include -#include +#include +#include DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controller) : - QListView(parent), + KListView(parent), m_controller(controller) { Q_ASSERT(controller != 0); setViewMode(QListView::IconMode); setResizeMode(QListView::Adjust); + setMouseTracking(true); viewport()->setAttribute(Qt::WA_Hover); - connect(this, SIGNAL(clicked(const QModelIndex&)), - controller, SLOT(triggerItem(const QModelIndex&))); + if (KGlobalSettings::singleClick()) { + connect(this, SIGNAL(clicked(const QModelIndex&)), + controller, SLOT(triggerItem(const QModelIndex&))); + } else { + 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()), + controller, SLOT(emitViewportEntered())); connect(controller, SIGNAL(showPreviewChanged(bool)), - this, SLOT(updateGridSize(bool))); + this, SLOT(slotShowPreviewChanged(bool))); + connect(controller, SIGNAL(showAdditionalInfoChanged(bool)), + this, SLOT(slotShowAdditionalInfoChanged(bool))); connect(controller, SIGNAL(zoomIn()), this, SLOT(zoomIn())); connect(controller, SIGNAL(zoomOut()), @@ -56,22 +69,24 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); Q_ASSERT(settings != 0); - m_viewOptions = QListView::viewOptions(); + m_viewOptions = KListView::viewOptions(); + m_viewOptions.showDecorationSelected = true; QFont font(settings->fontFamily(), settings->fontSize()); font.setItalic(settings->italicFont()); font.setBold(settings->boldFont()); m_viewOptions.font = font; - updateGridSize(controller->showPreview()); + setWordWrap(settings->numberOfTextlines() > 1); + updateGridSize(controller->showPreview(), controller->showAdditionalInfo()); if (settings->arrangement() == QListView::TopToBottom) { setFlow(QListView::LeftToRight); m_viewOptions.decorationPosition = QStyleOptionViewItem::Top; - } - else { + } else { setFlow(QListView::TopToBottom); m_viewOptions.decorationPosition = QStyleOptionViewItem::Left; + m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter; } } @@ -86,13 +101,13 @@ QStyleOptionViewItem DolphinIconsView::viewOptions() const void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event) { - QListView::contextMenuEvent(event); + KListView::contextMenuEvent(event); m_controller->triggerContextMenuRequest(event->pos()); } void DolphinIconsView::mouseReleaseEvent(QMouseEvent* event) { - QListView::mouseReleaseEvent(event); + KListView::mouseReleaseEvent(event); m_controller->triggerActivation(); } @@ -112,33 +127,17 @@ void DolphinIconsView::dropEvent(QDropEvent* event) event->source()); event->acceptProposedAction(); } - QListView::dropEvent(event); + KListView::dropEvent(event); } -void DolphinIconsView::updateGridSize(bool showPreview) +void DolphinIconsView::slotShowPreviewChanged(bool showPreview) { - const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); - Q_ASSERT(settings != 0); - - int gridWidth = settings->gridWidth(); - int gridHeight = settings->gridHeight(); - int size = settings->iconSize(); - - if (showPreview) { - const int previewSize = settings->previewSize(); - const int diff = previewSize - size; - Q_ASSERT(diff >= 0); - gridWidth += diff; - gridHeight += diff; - - size = previewSize; - } - - m_viewOptions.decorationSize = QSize(size, size); - setGridSize(QSize(gridWidth, gridHeight)); + updateGridSize(showPreview, m_controller->showAdditionalInfo()); +} - m_controller->setZoomInPossible(isZoomInPossible()); - m_controller->setZoomOutPossible(isZoomOutPossible()); +void DolphinIconsView::slotShowAdditionalInfoChanged(bool showAdditionalInfo) +{ + updateGridSize(m_controller->showPreview(), showAdditionalInfo); } void DolphinIconsView::zoomIn() @@ -153,8 +152,7 @@ void DolphinIconsView::zoomIn() if (showPreview) { const int previewSize = increasedIconSize(settings->previewSize()); settings->setPreviewSize(previewSize); - } - else { + } else { newIconSize = increasedIconSize(oldIconSize); settings->setIconSize(newIconSize); if (settings->previewSize() < newIconSize) { @@ -165,10 +163,10 @@ void DolphinIconsView::zoomIn() // increase also the grid size const int diff = newIconSize - oldIconSize; - settings->setGridWidth(settings->gridWidth() + diff); - settings->setGridHeight(settings->gridHeight() + diff); + settings->setItemWidth(settings->itemWidth() + diff); + settings->setItemHeight(settings->itemHeight() + diff); - updateGridSize(showPreview); + updateGridSize(showPreview, m_controller->showAdditionalInfo()); } } @@ -189,18 +187,17 @@ void DolphinIconsView::zoomOut() newIconSize = previewSize; settings->setIconSize(newIconSize); } - } - else { + } else { newIconSize = decreasedIconSize(settings->iconSize()); settings->setIconSize(newIconSize); } // decrease also the grid size const int diff = oldIconSize - newIconSize; - settings->setGridWidth(settings->gridWidth() - diff); - settings->setGridHeight(settings->gridHeight() - diff); + settings->setItemWidth(settings->itemWidth() - diff); + settings->setItemHeight(settings->itemHeight() - diff); - updateGridSize(showPreview); + updateGridSize(showPreview, m_controller->showAdditionalInfo()); } } @@ -223,12 +220,12 @@ 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; - default: Q_ASSERT(false); break; + 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; + default: Q_ASSERT(false); break; } return incSize; } @@ -238,14 +235,53 @@ 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; - default: Q_ASSERT(false); break; + 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; + default: Q_ASSERT(false); break; } return decSize; } +void DolphinIconsView::updateGridSize(bool showPreview, bool showAdditionalInfo) +{ + const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); + Q_ASSERT(settings != 0); + + int itemWidth = settings->itemWidth(); + int itemHeight = settings->itemHeight(); + int size = settings->iconSize(); + + if (showPreview) { + const int previewSize = settings->previewSize(); + const int diff = previewSize - size; + Q_ASSERT(diff >= 0); + itemWidth += diff; + itemHeight += diff; + + size = previewSize; + } + + if (showAdditionalInfo) { + itemHeight += m_viewOptions.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); + } else { + m_viewOptions.decorationSize = QSize(size, size); + } + + const int spacing = settings->gridSpacing(); + setGridSize(QSize(itemWidth + spacing, itemHeight + spacing)); + + m_controller->setZoomInPossible(isZoomInPossible()); + m_controller->setZoomOutPossible(isZoomOutPossible()); +} + #include "dolphiniconsview.moc"