#include "dolphincategorydrawer.h"
#include "dolphincontroller.h"
#include "dolphinsettings.h"
-
#include "dolphin_iconsmodesettings.h"
+#include "draganddrophelper.h"
+#include <kcategorizedsortfilterproxymodel.h>
#include <kdialog.h>
+#include <kdirmodel.h>
#include <QAbstractProxyModel>
#include <QApplication>
KCategorizedView(parent),
m_controller(controller),
m_categoryDrawer(0),
+ m_font(),
+ m_decorationSize(),
+ m_decorationPosition(QStyleOptionViewItem::Top),
+ m_displayAlignment(Qt::AlignHCenter),
m_itemSize(),
m_dragging(false),
m_dropRect()
setViewMode(QListView::IconMode);
setResizeMode(QListView::Adjust);
setSpacing(KDialog::spacingHint());
+ setMovement(QListView::Static);
+ setDragEnabled(true);
+ viewport()->setAcceptDrops(true);
+
setMouseTracking(true);
viewport()->setAttribute(Qt::WA_Hover);
// RETURN-key in keyPressEvent().
if (KGlobalSettings::singleClick()) {
connect(this, SIGNAL(clicked(const QModelIndex&)),
- controller, SLOT(triggerItem(const QModelIndex&)));
+ this, SLOT(triggerItem(const QModelIndex&)));
} else {
connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
- controller, SLOT(triggerItem(const QModelIndex&)));
+ this, 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(slotShowPreviewChanged(bool)));
- connect(controller, SIGNAL(showAdditionalInfoChanged(bool)),
- this, SLOT(slotShowAdditionalInfoChanged(bool)));
connect(controller, SIGNAL(zoomIn()),
this, SLOT(zoomIn()));
connect(controller, SIGNAL(zoomOut()),
this, SLOT(zoomOut()));
+ 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&)));
+
// apply the icons mode settings to the widget
const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
Q_ASSERT(settings != 0);
- m_viewOptions = KCategorizedView::viewOptions();
- m_viewOptions.showDecorationSelected = true;
-
- QFont font(settings->fontFamily(), settings->fontSize());
- font.setItalic(settings->italicFont());
- font.setBold(settings->boldFont());
- m_viewOptions.font = font;
+ m_font = QFont(settings->fontFamily(), settings->fontSize());
+ m_font.setItalic(settings->italicFont());
+ m_font.setBold(settings->boldFont());
setWordWrap(settings->numberOfTextlines() > 1);
- updateGridSize(controller->showPreview(), controller->showAdditionalInfo());
+ updateGridSize(view->showPreview(), 0);
if (settings->arrangement() == QListView::TopToBottom) {
setFlow(QListView::LeftToRight);
- m_viewOptions.decorationPosition = QStyleOptionViewItem::Top;
+ m_decorationPosition = QStyleOptionViewItem::Top;
+ m_displayAlignment = Qt::AlignHCenter;
} else {
setFlow(QListView::TopToBottom);
- m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
- m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
+ m_decorationPosition = QStyleOptionViewItem::Left;
+ m_displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
}
m_categoryDrawer = new DolphinCategoryDrawer();
setCategoryDrawer(m_categoryDrawer);
+
+ setFocus();
}
DolphinIconsView::~DolphinIconsView()
const bool leftToRightFlow = (flow() == QListView::LeftToRight);
QRect itemRect = KCategorizedView::visualRect(index);
+
const int maxWidth = m_itemSize.width();
const int maxHeight = m_itemSize.height();
itemRect.setHeight(maxHeight);
}
+ KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast<KCategorizedSortFilterProxyModel*>(model());
+ if (leftToRightFlow && !proxyModel->isCategorizedModel()) {
+ // TODO: QListView::visualRect() calculates a wrong position of the items under
+ // certain circumstances (e. g. if the text is too long). This issue is bypassed
+ // by the following code (I'll try create a patch for Qt but as Dolphin must also work with
+ // Qt 4.3.0 this workaround must get applied at least for KDE 4.0).
+ const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+ const int margin = settings->gridSpacing();
+ const int gridWidth = gridSize().width();
+ const int gridIndex = (itemRect.left() - margin + 1) / gridWidth;
+ const int centerInc = (maxWidth - itemRect.width()) / 2;
+ itemRect.moveLeft((gridIndex * gridWidth) + margin + centerInc);
+ }
+
return itemRect;
}
QStyleOptionViewItem DolphinIconsView::viewOptions() const
{
- return m_viewOptions;
+ QStyleOptionViewItem viewOptions = KCategorizedView::viewOptions();
+ viewOptions.font = m_font;
+ viewOptions.decorationPosition = m_decorationPosition;
+ viewOptions.decorationSize = m_decorationSize;
+ viewOptions.displayAlignment = m_displayAlignment;
+ viewOptions.showDecorationSelected = true;
+ return viewOptions;
}
void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
void DolphinIconsView::mousePressEvent(QMouseEvent* event)
{
- m_controller->triggerActivation();
+ m_controller->requestActivation();
if (!indexAt(event->pos()).isValid()) {
const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
KCategorizedView::mousePressEvent(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::startDrag(this, supportedActions);
+}
+
void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
{
if (event->mimeData()->hasUrls()) {
// TODO: remove this code when the issue #160611 is solved in Qt 4.4
const QModelIndex index = indexAt(event->pos());
setDirtyRegion(m_dropRect);
- m_dropRect = visualRect(index);
+
+ m_dropRect.setSize(QSize()); // set as invalid
+ if (index.isValid()) {
+ const KFileItem item = 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);
}
if (!selectionModel()->isSelected(indexAt(event->pos()))) {
const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
if (!urls.isEmpty()) {
+ const QModelIndex index = indexAt(event->pos());
+ const KFileItem item = itemForIndex(index);
m_controller->indicateDroppedUrls(urls,
m_controller->url(),
- indexAt(event->pos()),
- event->source());
+ item);
event->acceptProposedAction();
}
}
KCategorizedView::dropEvent(event);
+
m_dragging = false;
}
// TODO: remove this code when the issue #160611 is solved in Qt 4.4
if (m_dragging) {
- const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight);
- DolphinController::drawHoverIndication(viewport(), m_dropRect, brush);
+ const QBrush& brush = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight);
+ DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush);
}
}
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);
+ const bool trigger = currentIndex.isValid()
+ && (event->key() == Qt::Key_Return)
+ && (selModel->selectedIndexes().count() <= 1);
+ if (trigger) {
+ triggerItem(currentIndex);
}
}
-void DolphinIconsView::slotShowPreviewChanged(bool showPreview)
+void DolphinIconsView::triggerItem(const QModelIndex& index)
+{
+ m_controller->triggerItem(itemForIndex(index));
+}
+
+void DolphinIconsView::slotEntered(const QModelIndex& index)
{
- updateGridSize(showPreview, m_controller->showAdditionalInfo());
+ m_controller->emitItemEntered(itemForIndex(index));
}
-void DolphinIconsView::slotShowAdditionalInfoChanged(bool showAdditionalInfo)
+void DolphinIconsView::slotShowPreviewChanged()
{
- updateGridSize(m_controller->showPreview(), showAdditionalInfo);
+ const DolphinView* view = m_controller->dolphinView();
+ updateGridSize(view->showPreview(), additionalInfoCount());
+}
+
+void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info)
+{
+ const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+ if (!settings->showAdditionalInfo()) {
+ return;
+ }
+
+ const bool showPreview = m_controller->dolphinView()->showPreview();
+ updateGridSize(showPreview, info.count());
}
void DolphinIconsView::zoomIn()
const int oldIconSize = settings->iconSize();
int newIconSize = oldIconSize;
- const bool showPreview = m_controller->showPreview();
+ const bool showPreview = m_controller->dolphinView()->showPreview();
if (showPreview) {
const int previewSize = increasedIconSize(settings->previewSize());
settings->setPreviewSize(previewSize);
settings->setItemWidth(settings->itemWidth() + diff);
settings->setItemHeight(settings->itemHeight() + diff);
- updateGridSize(showPreview, m_controller->showAdditionalInfo());
+ updateGridSize(showPreview, additionalInfoCount());
}
}
const int oldIconSize = settings->iconSize();
int newIconSize = oldIconSize;
- const bool showPreview = m_controller->showPreview();
+ const bool showPreview = m_controller->dolphinView()->showPreview();
if (showPreview) {
const int previewSize = decreasedIconSize(settings->previewSize());
settings->setPreviewSize(previewSize);
settings->setItemWidth(settings->itemWidth() - diff);
settings->setItemHeight(settings->itemHeight() - diff);
- updateGridSize(showPreview, m_controller->showAdditionalInfo());
+ updateGridSize(showPreview, additionalInfoCount());
}
}
bool DolphinIconsView::isZoomInPossible() const
{
IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
- const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize();
+ const bool showPreview = m_controller->dolphinView()->showPreview();
+ const int size = showPreview ? settings->previewSize() : settings->iconSize();
return size < KIconLoader::SizeEnormous;
}
bool DolphinIconsView::isZoomOutPossible() const
{
IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
- const int size = m_controller->showPreview() ? settings->previewSize() : settings->iconSize();
+ const bool showPreview = m_controller->dolphinView()->showPreview();
+ const int size = showPreview ? settings->previewSize() : settings->iconSize();
return size > KIconLoader::SizeSmall;
}
return decSize;
}
-void DolphinIconsView::updateGridSize(bool showPreview, bool showAdditionalInfo)
+void DolphinIconsView::updateGridSize(bool showPreview, int additionalInfoCount)
{
const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
Q_ASSERT(settings != 0);
size = previewSize;
}
- if (showAdditionalInfo) {
- itemHeight += m_viewOptions.font.pointSize() * 2;
- }
+ Q_ASSERT(additionalInfoCount >= 0);
+ itemHeight += additionalInfoCount * m_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);
+ m_decorationSize = QSize(itemWidth, size);
} else {
- m_viewOptions.decorationSize = QSize(size, size);
+ m_decorationSize = QSize(size, size);
}
- const int spacing = settings->gridSpacing();
- setGridSize(QSize(itemWidth + spacing, itemHeight + spacing));
-
m_itemSize = QSize(itemWidth, itemHeight);
+ const int spacing = settings->gridSpacing();
+ setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
+
m_controller->setZoomInPossible(isZoomInPossible());
m_controller->setZoomOutPossible(isZoomOutPossible());
}
+KFileItem DolphinIconsView::itemForIndex(const QModelIndex& index) const
+{
+ QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(model());
+ KDirModel* dirModel = static_cast<KDirModel*>(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;
+}
+
#include "dolphiniconsview.moc"
projects / dolphin.git / blobdiff