Move all the things (YES. Move them.)

Also, implemented some basic modlist logic, to be wired up.

depends/groupview/src/categorizedsortfilterproxymodel.cpp

@@ -0,0 +1,168 @@
+/**
+  * This file is part of the KDE project
+  * Copyright (C) 2007 Rafael Fernández López <ereslibre@kde.org>
+  * Copyright (C) 2007 John Tapsell <tapsell@kde.org>
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Library General Public
+  * License as published by the Free Software Foundation; either
+  * version 2 of the License, or (at your option) any later version.
+  *
+  * This library is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Library General Public License for more details.
+  *
+  * You should have received a copy of the GNU Library General Public License
+  * along with this library; see the file COPYING.LIB.  If not, write to
+  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  * Boston, MA 02110-1301, USA.
+  */
+
+#include "categorizedsortfilterproxymodel.h"
+#include "categorizedsortfilterproxymodel_p.h"
+
+#include <limits.h>
+
+#include <QItemSelection>
+#include <QStringList>
+#include <QSize>
+
+KCategorizedSortFilterProxyModel::KCategorizedSortFilterProxyModel ( QObject *parent )
+	: QSortFilterProxyModel ( parent )
+	, d ( new Private() )
+{
+}
+
+KCategorizedSortFilterProxyModel::~KCategorizedSortFilterProxyModel()
+{
+	delete d;
+}
+
+void KCategorizedSortFilterProxyModel::sort ( int column, Qt::SortOrder order )
+{
+	d->sortColumn = column;
+	d->sortOrder = order;
+
+	QSortFilterProxyModel::sort ( column, order );
+}
+
+bool KCategorizedSortFilterProxyModel::isCategorizedModel() const
+{
+	return d->categorizedModel;
+}
+
+void KCategorizedSortFilterProxyModel::setCategorizedModel ( bool categorizedModel )
+{
+	if ( categorizedModel == d->categorizedModel )
+	{
+		return;
+	}
+
+	d->categorizedModel = categorizedModel;
+
+	invalidate();
+}
+
+int KCategorizedSortFilterProxyModel::sortColumn() const
+{
+	return d->sortColumn;
+}
+
+Qt::SortOrder KCategorizedSortFilterProxyModel::sortOrder() const
+{
+	return d->sortOrder;
+}
+
+void KCategorizedSortFilterProxyModel::setSortCategoriesByNaturalComparison ( bool sortCategoriesByNaturalComparison )
+{
+	if ( sortCategoriesByNaturalComparison == d->sortCategoriesByNaturalComparison )
+	{
+		return;
+	}
+
+	d->sortCategoriesByNaturalComparison = sortCategoriesByNaturalComparison;
+
+	invalidate();
+}
+
+bool KCategorizedSortFilterProxyModel::sortCategoriesByNaturalComparison() const
+{
+	return d->sortCategoriesByNaturalComparison;
+}
+
+bool KCategorizedSortFilterProxyModel::lessThan ( const QModelIndex &left, const QModelIndex &right ) const
+{
+	if ( d->categorizedModel )
+	{
+		int compare = compareCategories ( left, right );
+
+		if ( compare > 0 ) // left is greater than right
+		{
+			return false;
+		}
+		else if ( compare < 0 ) // left is less than right
+		{
+			return true;
+		}
+	}
+
+	return subSortLessThan ( left, right );
+}
+
+bool KCategorizedSortFilterProxyModel::subSortLessThan ( const QModelIndex &left, const QModelIndex &right ) const
+{
+	return QSortFilterProxyModel::lessThan ( left, right );
+}
+
+int KCategorizedSortFilterProxyModel::compareCategories ( const QModelIndex &left, const QModelIndex &right ) const
+{
+	QVariant l = ( left.model() ? left.model()->data ( left, CategorySortRole ) : QVariant() );
+	QVariant r = ( right.model() ? right.model()->data ( right, CategorySortRole ) : QVariant() );
+
+	Q_ASSERT ( l.isValid() );
+	Q_ASSERT ( r.isValid() );
+	Q_ASSERT ( l.type() == r.type() );
+
+	if ( l.type() == QVariant::String )
+	{
+		QString lstr = l.toString();
+		QString rstr = r.toString();
+
+		/*
+		if ( d->sortCategoriesByNaturalComparison )
+		{
+			return KStringHandler::naturalCompare ( lstr, rstr );
+		}
+		else
+		{
+			*/
+			if ( lstr < rstr )
+			{
+				return -1;
+			}
+
+			if ( lstr > rstr )
+			{
+				return 1;
+			}
+
+			return 0;
+		//}
+	}
+
+	qlonglong lint = l.toLongLong();
+	qlonglong rint = r.toLongLong();
+
+	if ( lint < rint )
+	{
+		return -1;
+	}
+
+	if ( lint > rint )
+	{
+		return 1;
+	}
+
+	return 0;
+}

depends/groupview/src/categorizedsortfilterproxymodel_p.h

@@ -0,0 +1,48 @@
+/**
+  * This file is part of the KDE project
+  * Copyright (C) 2007 Rafael Fernández López <ereslibre@kde.org>
+  * Copyright (C) 2007 John Tapsell <tapsell@kde.org>
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Library General Public
+  * License as published by the Free Software Foundation; either
+  * version 2 of the License, or (at your option) any later version.
+  *
+  * This library is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Library General Public License for more details.
+  *
+  * You should have received a copy of the GNU Library General Public License
+  * along with this library; see the file COPYING.LIB.  If not, write to
+  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  * Boston, MA 02110-1301, USA.
+  */
+
+#ifndef KCATEGORIZEDSORTFILTERPROXYMODEL_P_H
+#define KCATEGORIZEDSORTFILTERPROXYMODEL_P_H
+
+class KCategorizedSortFilterProxyModel;
+
+class KCategorizedSortFilterProxyModel::Private
+{
+public:
+	Private()
+		: sortColumn ( 0 )
+		, sortOrder ( Qt::AscendingOrder )
+		, categorizedModel ( false )
+		, sortCategoriesByNaturalComparison ( true )
+	{
+	}
+
+	~Private()
+	{
+	}
+
+	int sortColumn;
+	Qt::SortOrder sortOrder;
+	bool categorizedModel;
+	bool sortCategoriesByNaturalComparison;
+};
+
+#endif

depends/groupview/src/categorizedview_p.h

@@ -0,0 +1,159 @@
+/**
+  * This file is part of the KDE project
+  * Copyright (C) 2007, 2009 Rafael Fernández López <ereslibre@kde.org>
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Library General Public
+  * License as published by the Free Software Foundation; either
+  * version 2 of the License, or (at your option) any later version.
+  *
+  * This library is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Library General Public License for more details.
+  *
+  * You should have received a copy of the GNU Library General Public License
+  * along with this library; see the file COPYING.LIB.  If not, write to
+  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  * Boston, MA 02110-1301, USA.
+  */
+
+#ifndef KCATEGORIZEDVIEW_P_H
+#define KCATEGORIZEDVIEW_P_H
+
+class KCategorizedSortFilterProxyModel;
+class KCategoryDrawer;
+class KCategoryDrawerV2;
+class KCategoryDrawerV3;
+
+/**
+  * @internal
+  */
+class KCategorizedView::Private
+{
+public:
+	struct Block;
+	struct Item;
+
+	Private(KCategorizedView *q);
+	~Private();
+
+	/**
+	  * @return whether this view has all required elements to be categorized.
+	  */
+	bool isCategorized() const;
+
+	/**
+	  * @return the block rect for the representative @p representative.
+	  */
+	QStyleOptionViewItemV4 blockRect(const QModelIndex &representative);
+
+	/**
+	  * Returns the first and last element that intersects with rect.
+	  *
+	  * @note see that here we cannot take out items between first and last (as we could
+	  *       do with the rubberband).
+	  *
+	  * Complexity: O(log(n)) where n is model()->rowCount().
+	  */
+	QPair<QModelIndex, QModelIndex> intersectingIndexesWithRect(const QRect &rect) const;
+
+	/**
+	  * Returns the position of the block of @p category.
+	  *
+	  * Complexity: O(n) where n is the number of different categories when the block has been
+	  *             marked as in quarantine. O(1) the rest of the times (the vast majority).
+	  */
+	QPoint blockPosition(const QString &category);
+
+	/**
+	  * Returns the height of the block determined by @p category.
+	  */
+	int blockHeight(const QString &category);
+
+	/**
+	  * Returns the actual viewport width.
+	  */
+	int viewportWidth() const;
+
+	/**
+	  * Marks all elements as in quarantine.
+	  *
+	  * Complexity: O(n) where n is model()->rowCount().
+	  *
+	  * @warning this is an expensive operation
+	  */
+	void regenerateAllElements();
+
+	/**
+	  * Update internal information, and keep sync with the real information that the model contains.
+	  */
+	void rowsInserted(const QModelIndex &parent, int start, int end);
+
+	/**
+	  * Returns @p rect in viewport terms, taking in count horizontal and vertical offsets.
+	  */
+	QRect mapToViewport(const QRect &rect) const;
+
+	/**
+	  * Returns @p rect in absolute terms, converted from viewport position.
+	  */
+	QRect mapFromViewport(const QRect &rect) const;
+
+	/**
+	  * Returns the height of the highest element in last row. This is only applicable if there is
+	  * no grid set and uniformItemSizes is false.
+	  *
+	  * @param block in which block are we searching. Necessary to stop the search if we hit the
+	  *              first item in this block.
+	  */
+	int highestElementInLastRow(const Block &block) const;
+
+	/**
+	  * Returns whether the view has a valid grid size.
+	  */
+	bool hasGrid() const;
+
+	/**
+	  * Returns the category for the given index.
+	  */
+	QString categoryForIndex(const QModelIndex &index) const;
+
+	/**
+	  * Updates the visual rect for item when flow is LeftToRight.
+	  */
+	void leftToRightVisualRect(const QModelIndex &index, Item &item,
+							const Block &block, const QPoint &blockPos) const;
+
+	/**
+	  * Updates the visual rect for item when flow is TopToBottom.
+	  * @note we only support viewMode == ListMode in this case.
+	  */
+	void topToBottomVisualRect(const QModelIndex &index, Item &item,
+							const Block &block, const QPoint &blockPos) const;
+
+	/**
+	  * Called when expand or collapse has been clicked on the category drawer.
+	  */
+	void _k_slotCollapseOrExpandClicked(QModelIndex);
+
+	KCategorizedView *q;
+	KCategorizedSortFilterProxyModel *proxyModel;
+	KCategoryDrawer *categoryDrawer;
+	int categorySpacing;
+	bool alternatingBlockColors;
+	bool collapsibleBlocks;
+	bool constantItemWidth;
+
+	Block *hoveredBlock;
+	QString hoveredCategory;
+	QModelIndex hoveredIndex;
+
+	QPoint pressedPosition;
+	QRect rubberBandRect;
+
+	QHash<QString, Block> blocks;
+};
+
+#endif // KCATEGORIZEDVIEW_P_H
+

depends/groupview/src/categorydrawer.cpp

@@ -0,0 +1,231 @@
+/**
+  * This file is part of the KDE project
+  * Copyright (C) 2007, 2009 Rafael Fernández López <ereslibre@kde.org>
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Library General Public
+  * License as published by the Free Software Foundation; either
+  * version 2 of the License, or (at your option) any later version.
+  *
+  * This library is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Library General Public License for more details.
+  *
+  * You should have received a copy of the GNU Library General Public License
+  * along with this library; see the file COPYING.LIB.  If not, write to
+  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  * Boston, MA 02110-1301, USA.
+  */
+
+#include "categorydrawer.h"
+
+#include <QPainter>
+#include <QStyleOption>
+#include <QApplication>
+
+#include <categorizedview.h>
+#include <categorizedsortfilterproxymodel.h>
+
+#define HORIZONTAL_HINT 3
+
+class KCategoryDrawer::Private
+{
+public:
+	Private(KCategorizedView *view)
+		: view(view)
+		, leftMargin(0)
+		, rightMargin(0)
+    {
+    }
+
+    ~Private()
+    {
+    }
+    int leftMargin;
+    int rightMargin;
+    KCategorizedView *view;
+};
+
+KCategoryDrawer::KCategoryDrawer(KCategorizedView *view)
+    : QObject(view)
+    , d(new Private(view))
+{
+	setLeftMargin(2);
+	setRightMargin(2);
+}
+
+KCategoryDrawer::~KCategoryDrawer()
+{
+    delete d;
+}
+
+
+void KCategoryDrawer::drawCategory(const QModelIndex &index,
+                                   int /*sortRole*/,
+                                   const QStyleOption &option,
+                                   QPainter *painter) const
+{
+    painter->setRenderHint(QPainter::Antialiasing);
+
+    const QString category = index.model()->data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole).toString();
+    const QRect optRect = option.rect;
+    QFont font(QApplication::font());
+    font.setBold(true);
+    const QFontMetrics fontMetrics = QFontMetrics(font);
+
+    QColor outlineColor = option.palette.text().color();
+    outlineColor.setAlphaF(0.35);
+
+    //BEGIN: top left corner
+    {
+        painter->save();
+        painter->setPen(outlineColor);
+        const QPointF topLeft(optRect.topLeft());
+        QRectF arc(topLeft, QSizeF(4, 4));
+        arc.translate(0.5, 0.5);
+        painter->drawArc(arc, 1440, 1440);
+        painter->restore();
+    }
+    //END: top left corner
+
+    //BEGIN: left vertical line
+    {
+        QPoint start(optRect.topLeft());
+        start.ry() += 3;
+        QPoint verticalGradBottom(optRect.topLeft());
+        verticalGradBottom.ry() += fontMetrics.height() + 5;
+        QLinearGradient gradient(start, verticalGradBottom);
+        gradient.setColorAt(0, outlineColor);
+        gradient.setColorAt(1, Qt::transparent);
+        painter->fillRect(QRect(start, QSize(1, fontMetrics.height() + 5)), gradient);
+    }
+    //END: left vertical line
+
+    //BEGIN: horizontal line
+    {
+        QPoint start(optRect.topLeft());
+        start.rx() += 3;
+        QPoint horizontalGradTop(optRect.topLeft());
+        horizontalGradTop.rx() += optRect.width() - 6;
+        painter->fillRect(QRect(start, QSize(optRect.width() - 6, 1)), outlineColor);
+    }
+    //END: horizontal line
+
+    //BEGIN: top right corner
+    {
+        painter->save();
+        painter->setPen(outlineColor);
+        QPointF topRight(optRect.topRight());
+        topRight.rx() -= 4;
+        QRectF arc(topRight, QSizeF(4, 4));
+        arc.translate(0.5, 0.5);
+        painter->drawArc(arc, 0, 1440);
+        painter->restore();
+    }
+    //END: top right corner
+
+    //BEGIN: right vertical line
+    {
+        QPoint start(optRect.topRight());
+        start.ry() += 3;
+        QPoint verticalGradBottom(optRect.topRight());
+        verticalGradBottom.ry() += fontMetrics.height() + 5;
+        QLinearGradient gradient(start, verticalGradBottom);
+        gradient.setColorAt(0, outlineColor);
+        gradient.setColorAt(1, Qt::transparent);
+        painter->fillRect(QRect(start, QSize(1, fontMetrics.height() + 5)), gradient);
+    }
+    //END: right vertical line
+
+    //BEGIN: text
+    {
+        QRect textRect(option.rect);
+        textRect.setTop(textRect.top() + 7);
+        textRect.setLeft(textRect.left() + 7);
+        textRect.setHeight(fontMetrics.height());
+        textRect.setRight(textRect.right() - 7);
+
+        painter->save();
+        painter->setFont(font);
+        QColor penColor(option.palette.text().color());
+        penColor.setAlphaF(0.6);
+        painter->setPen(penColor);
+        painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, category);
+        painter->restore();
+    }
+    //END: text
+}
+
+int KCategoryDrawer::categoryHeight(const QModelIndex &index, const QStyleOption &option) const
+{
+    Q_UNUSED(index);
+    Q_UNUSED(option)
+
+    QFont font(QApplication::font());
+    font.setBold(true);
+    QFontMetrics fontMetrics(font);
+
+    const int height = fontMetrics.height() + 1 /* 1 pixel-width gradient */
+                                            + 11 /* top and bottom separation */;
+    return height;
+}
+
+int KCategoryDrawer::leftMargin() const
+{
+    return d->leftMargin;
+}
+
+void KCategoryDrawer::setLeftMargin(int leftMargin)
+{
+    d->leftMargin = leftMargin;
+}
+
+int KCategoryDrawer::rightMargin() const
+{
+    return d->rightMargin;
+}
+
+void KCategoryDrawer::setRightMargin(int rightMargin)
+{
+    d->rightMargin = rightMargin;
+}
+
+KCategoryDrawer &KCategoryDrawer::operator=(const KCategoryDrawer &cd)
+{
+    d->leftMargin = cd.d->leftMargin;
+    d->rightMargin = cd.d->rightMargin;
+	d->view = cd.d->view;
+    return *this;
+}
+
+KCategorizedView *KCategoryDrawer::view() const
+{
+    return d->view;
+}
+
+void KCategoryDrawer::mouseButtonPressed(const QModelIndex&, const QRect&, QMouseEvent *event)
+{
+    event->ignore();
+}
+
+void KCategoryDrawer::mouseButtonReleased(const QModelIndex&, const QRect&, QMouseEvent *event)
+{
+    event->ignore();
+}
+
+void KCategoryDrawer::mouseMoved(const QModelIndex&, const QRect&, QMouseEvent *event)
+{
+    event->ignore();
+}
+
+void KCategoryDrawer::mouseButtonDoubleClicked(const QModelIndex&, const QRect&, QMouseEvent *event)
+{
+    event->ignore();
+}
+
+void KCategoryDrawer::mouseLeft(const QModelIndex&, const QRect&)
+{
+}
+
+#include "categorydrawer.moc"