#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>
setViewMode(QListView::IconMode);
setResizeMode(QListView::Adjust);
setSpacing(KDialog::spacingHint());
+ setMovement(QListView::Static);
+ setDragEnabled(true);
+ viewport()->setAcceptDrops(true);
+
setMouseTracking(true);
viewport()->setAttribute(Qt::WA_Hover);
}
connect(this, SIGNAL(viewportEntered()),
controller, SLOT(emitViewportEntered()));
- connect(controller, SIGNAL(showPreviewChanged(bool)),
- this, SLOT(slotShowPreviewChanged(bool)));
- connect(controller, SIGNAL(additionalInfoCountChanged(int)),
- this, SLOT(slotAdditionalInfoCountChanged(int)));
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&)));
m_viewOptions.font = font;
setWordWrap(settings->numberOfTextlines() > 1);
- updateGridSize(controller->showPreview(), controller->additionalInfoCount());
+ updateGridSize(view->showPreview(), 0);
if (settings->arrangement() == QListView::TopToBottom) {
setFlow(QListView::LeftToRight);
m_categoryDrawer = new DolphinCategoryDrawer();
setCategoryDrawer(m_categoryDrawer);
+
+ setFocus();
}
DolphinIconsView::~DolphinIconsView()
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;
+ itemRect.moveLeft(gridIndex * gridWidth + margin);
+ }
+
return itemRect;
}
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);
+ if (itemForIndex(index).isDir()) {
+ m_dropRect = visualRect(index);
+ } else {
+ m_dropRect.setSize(QSize()); // set as invalid
+ }
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);
+ DragAndDropHelper::drawHoverIndication(viewport(), m_dropRect, brush);
}
}
m_controller->emitItemEntered(itemForIndex(index));
}
-void DolphinIconsView::slotShowPreviewChanged(bool showPreview)
+void DolphinIconsView::slotShowPreviewChanged()
{
- updateGridSize(showPreview, m_controller->additionalInfoCount());
+ const DolphinView* view = m_controller->dolphinView();
+ const int infoCount = view->additionalInfo().count();
+ updateGridSize(view->showPreview(), infoCount);
}
-void DolphinIconsView::slotAdditionalInfoCountChanged(int count)
+void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info)
{
- updateGridSize(m_controller->showPreview(), count);
+ 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->additionalInfoCount());
+ const int infoCount = m_controller->dolphinView()->additionalInfo().count();
+ updateGridSize(showPreview, infoCount);
}
}
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->additionalInfoCount());
+ const int infoCount = m_controller->dolphinView()->additionalInfo().count();
+ updateGridSize(showPreview, infoCount);
}
}
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;
}
}
const int spacing = settings->gridSpacing();
- setGridSize(QSize(itemWidth + spacing, itemHeight + spacing));
+ setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
m_itemSize = QSize(itemWidth, itemHeight);
return dirModel->itemForIndex(dirIndex);
}
-
#include "dolphiniconsview.moc"
projects / dolphin.git / blobdiff